diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-05-28 22:55:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-05-28 22:55:56 +0100 |
| commit | a648df38898ddbad1bd6d71a6680b3788f6528b2 (patch) | |
| tree | 690749f9f0534451b35ecd5707e3a09e8b4728b2 /hw/net/virtio-net.c | |
| parent | 62c0ac5041e9130b041adfa13a41583d3c3ddd24 (diff) | |
| parent | 4f8a39494aded9f2026a26b137378ea2ee3d5338 (diff) | |
| download | focaccia-qemu-a648df38898ddbad1bd6d71a6680b3788f6528b2.tar.gz focaccia-qemu-a648df38898ddbad1bd6d71a6680b3788f6528b2.zip | |
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>
Diffstat (limited to 'hw/net/virtio-net.c')
| -rw-r--r-- | hw/net/virtio-net.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 6b7e8dd04e..05bd50d3f6 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -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; |