[qemu-xen staging-4.14] net/virtio: Fix failover_replug_primary() return value regression

[patchbot@xxxxxxx]

commit b17b3c209b182c00a93e1987e4c1078275d162ce
Author:     Markus Armbruster <armbru@xxxxxxxxxx>
AuthorDate: Tue Jun 30 11:03:26 2020 +0200
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Wed Sep 2 19:06:19 2020 -0500

    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 <jfreimann@xxxxxxxxxx>
    Cc: Michael S. Tsirkin <mst@xxxxxxxxxx>
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Markus Armbruster <armbru@xxxxxxxxxx>
    Reviewed-by: Jens Freimann <jfreimann@xxxxxxxxxx>
    Reviewed-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
    Message-Id: <20200630090351.1247703-2-armbru@xxxxxxxxxx>
    (cherry picked from commit ca72efccbe33373810341a0d8a10f5698b8fbc87)
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 hw/net/virtio-net.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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:
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging-4.14