-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1 iQEcBAABAgAGBQJgrwypAAoJEO8Ells5jWIRDfsIAJyrDUbgDoeg4dM9TEvE+3xr 5Fd52wVozlQhn6zz2ZfEcqVfWNVbVHsVcYnpJQMXOCda5CIl5qZbl2EzS/lBrdkm f5XUD4lFhwH1pUUugT20lEFYct0dv2UddEmLrEctI+CB5d9bA+SqeDdLAHYbrDIR jfc/vOrP/1sfvWCsXmZzJ+0UhoGoS8qU2eLx9nwSvan3uLMmLWfWSTUltvwMNvZD oA6a1O9poV00W89W25tSeMOKKPaS+RZYVFvDd0HzQYRI0t496VxK/Jw0VqfF+iCl 3KBzjhUi7QyFWgQY5xFQcMWwob8McOJOUGX4EQERm8EbHy8VhpugCHinqLPqf38= =fRpo -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging # gpg: Signature made Thu 27 May 2021 04:06:17 BST # gpg: using RSA key EF04965B398D6211 # gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal] # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211 * remotes/jasowang/tags/net-pull-request: tap-bsd: Remove special casing for older OpenBSD releases virtio-net: failover: add missing remove_migration_state_change_notifier() hw/net/imx_fec: return 0xffff when accessing non-existing PHY Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
a648df3889
@ -283,9 +283,8 @@ static uint32_t imx_phy_read(IMXFECState *s, int reg)
|
||||
uint32_t phy = reg / 32;
|
||||
|
||||
if (phy != s->phy_num) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "[%s.phy]%s: Bad phy num %u\n",
|
||||
TYPE_IMX_FEC, __func__, phy);
|
||||
return 0;
|
||||
trace_imx_phy_read_num(phy, s->phy_num);
|
||||
return 0xffff;
|
||||
}
|
||||
|
||||
reg %= 32;
|
||||
@ -345,8 +344,7 @@ static void imx_phy_write(IMXFECState *s, int reg, uint32_t val)
|
||||
uint32_t phy = reg / 32;
|
||||
|
||||
if (phy != s->phy_num) {
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "[%s.phy]%s: Bad phy num %u\n",
|
||||
TYPE_IMX_FEC, __func__, phy);
|
||||
trace_imx_phy_write_num(phy, s->phy_num);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -402,7 +402,9 @@ i82596_channel_attention(void *s) "%p: Received CHANNEL ATTENTION"
|
||||
|
||||
# imx_fec.c
|
||||
imx_phy_read(uint32_t val, int phy, int reg) "0x%04"PRIx32" <= phy[%d].reg[%d]"
|
||||
imx_phy_read_num(int phy, int configured) "read request from unconfigured phy %d (configured %d)"
|
||||
imx_phy_write(uint32_t val, int phy, int reg) "0x%04"PRIx32" => phy[%d].reg[%d]"
|
||||
imx_phy_write_num(int phy, int configured) "write request to unconfigured phy %d (configured %d)"
|
||||
imx_phy_update_link(const char *s) "%s"
|
||||
imx_phy_reset(void) ""
|
||||
imx_fec_read_bd(uint64_t addr, int flags, int len, int data) "tx_bd 0x%"PRIx64" flags 0x%04x len %d data 0x%08x"
|
||||
|
@ -3373,6 +3373,7 @@ static void virtio_net_device_unrealize(DeviceState *dev)
|
||||
|
||||
if (n->failover) {
|
||||
device_listener_unregister(&n->primary_listener);
|
||||
remove_migration_state_change_notifier(&n->migration_state);
|
||||
}
|
||||
|
||||
max_queues = n->multiqueue ? n->max_queues : 1;
|
||||
|
@ -35,10 +35,6 @@
|
||||
#include <net/if_tap.h>
|
||||
#endif
|
||||
|
||||
#if defined(__OpenBSD__)
|
||||
#include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#ifndef __FreeBSD__
|
||||
int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
|
||||
int vnet_hdr_required, int mq_required, Error **errp)
|
||||
@ -59,11 +55,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
|
||||
if (*ifname) {
|
||||
snprintf(dname, sizeof dname, "/dev/%s", ifname);
|
||||
} else {
|
||||
#if defined(__OpenBSD__) && OpenBSD < 201605
|
||||
snprintf(dname, sizeof dname, "/dev/tun%d", i);
|
||||
#else
|
||||
snprintf(dname, sizeof dname, "/dev/tap%d", i);
|
||||
#endif
|
||||
}
|
||||
TFR(fd = open(dname, O_RDWR));
|
||||
if (fd >= 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user