From: Markus Armbruster Date: Tue, 30 Jun 2020 09:03:26 +0000 (+0200) Subject: net/virtio: Fix failover_replug_primary() return value regression X-Git-Tag: qemu-xen-4.14.1^2~43 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b17b3c209b182c00a93e1987e4c1078275d162ce;p=qemu-xen.git net/virtio: Fix failover_replug_primary() return value regression Commit 150ab54aa6 "net/virtio: fix re-plugging of primary device" fixed failover_replug_primary() to return false on failure. Commit 5a0948d36c "net/virtio: Fix failover error handling crash bugs" broke it again for hotplug_handler_plug() failure. Unbreak it. Commit 5a0948d36c4cbc1c5534afac6fee99de55245d12 Fixes: 5a0948d36c4cbc1c5534afac6fee99de55245d12 Cc: Jens Freimann Cc: Michael S. Tsirkin Cc: qemu-stable@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Jens Freimann Reviewed-by: Michael S. Tsirkin Message-Id: <20200630090351.1247703-2-armbru@redhat.com> (cherry picked from commit ca72efccbe33373810341a0d8a10f5698b8fbc87) Signed-off-by: Michael Roth --- diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index a46e3b37a7..e7e2c2acdb 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -2828,7 +2828,7 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp) if (err) { goto out; } - hotplug_handler_plug(hotplug_ctrl, n->primary_dev, errp); + hotplug_handler_plug(hotplug_ctrl, n->primary_dev, &err); } out: