OSDN Git Service

net/virtio: fix dev_unplug_pending
authorJens Freimann <jfreimann@redhat.com>
Wed, 20 Nov 2019 15:49:48 +0000 (16:49 +0100)
committerJason Wang <jasowang@redhat.com>
Mon, 25 Nov 2019 15:30:28 +0000 (23:30 +0800)
commit284f42a520cd9f5905abac2fa50397423890de8f
tree33e471c9d4372ce0b59533e99a97f1d1d61b42f1
parent122e6d2a9c1bf8aa1d51409c15809a82621515b1
net/virtio: fix dev_unplug_pending

.dev_unplug_pending is set up by virtio-net code indepent of failover
support was set for the device or not. This gives a wrong result when
we check for existing primary devices in migration code.

Fix this by actually calling dev_unplug_pending() instead of just
checking if the function pointer was set. When the feature was not
negotiated dev_unplug_pending() will always return false. This prevents
us from going into the wait-unplug state when there's no primary device
present.

Fixes: 9711cd0dfc3f ("net/virtio: add failover support")
Signed-off-by: Jens Freimann <jfreimann@redhat.com>
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
hw/net/virtio-net.c
migration/savevm.c