aboutsummaryrefslogtreecommitdiff
path: root/hw/net
diff options
context:
space:
mode:
authorLaurent Vivier <lvivier@redhat.com>2021-02-12 14:52:48 +0100
committerMichael S. Tsirkin <mst@redhat.com>2021-02-23 10:06:55 -0500
commit00e7b1299599384dfdda2a2a4570a0fb2d69eb6b (patch)
tree7fe50d7a1c588f618b580626b81fbe86bcc0d7f8 /hw/net
parentb01a49014a867dc75fdac610c436810ca62b335c (diff)
downloadqemu-00e7b1299599384dfdda2a2a4570a0fb2d69eb6b.zip
qemu-00e7b1299599384dfdda2a2a4570a0fb2d69eb6b.tar.gz
qemu-00e7b1299599384dfdda2a2a4570a0fb2d69eb6b.tar.bz2
virtio-net: add missing object_unref()
failover_add_primary() calls qdev_device_add() and doesn't unref the device. Because of that, when the device is unplugged a reference is remaining and prevents the cleanup of the object. This prevents to be able to plugin back the failover primary device, with errors like: (qemu) device_add vfio-pci,host=0000:41:00.0,id=hostdev0,bus=root.3,failover_pair_id=net0 (qemu) device_del hostdev0 We can check with "info qtree" and "info pci" that the device has been removed, and then: (qemu) device_add vfio-pci,host=0000:41:00.0,id=hostdev1,bus=root.3,failover_pair_id=net0 Error: vfio 0000:41:00.0: device is already attached (qemu) device_add vfio-pci,host=0000:41:00.0,id=hostdev0,bus=root.3,failover_pair_id=net0 qemu-kvm: Duplicate ID 'hostdev0' for device Fixes: 21e8709b29cd ("failover: Remove primary_dev member") Cc: quintela@redhat.com Signed-off-by: Laurent Vivier <lvivier@redhat.com> Message-Id: <20210212135250.2738750-3-lvivier@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Jens Freimann <jfreimann@redhat.com>
Diffstat (limited to 'hw/net')
-rw-r--r--hw/net/virtio-net.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 5150f29..1c5af08 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -862,6 +862,8 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
dev = qdev_device_add(opts, &err);
if (err) {
qemu_opts_del(opts);
+ } else {
+ object_unref(OBJECT(dev));
}
} else {
error_setg(errp, "Primary device not found");