[PULL,03/28] net/virtio: Fix failover_replug_primary() return value regression

Commit Message

Markus Armbruster July 2, 2020, 11:09 a.m. UTC

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 <[e-mail]>
Cc: Michael S. Tsirkin <[e-mail]>
Cc: [e-mail]
Signed-off-by: Markus Armbruster <[e-mail]>
Reviewed-by: Jens Freimann <[e-mail]>
Reviewed-by: Michael S. Tsirkin <[e-mail]>
Message-Id: <[e-mail]>
---
 hw/net/virtio-net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index aff67a92df..9bb5578e5d 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3129,7 +3129,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: