67 lines
2.5 KiB
Diff
67 lines
2.5 KiB
Diff
From d66b778c2f888507dedc3e4111006215dd394b95 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Thu, 25 Feb 2021 23:14:47 -0500
|
|
Subject: [PATCH 50/54] virtio-net: add missing object_unref()
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: <20210225231447.2187738-28-lvivier@redhat.com>
|
|
Patchwork-id: 101266
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 27/27] virtio-net: add missing object_unref()
|
|
Bugzilla: 1819991
|
|
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
|
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
BZ: https://bugzilla.redhat.com/1819991
|
|
BRANCH: rhel-av-8.4.0
|
|
UPSTREAM: Merged
|
|
|
|
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>
|
|
(cherry picked from commit 00e7b1299599384dfdda2a2a4570a0fb2d69eb6b)
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/net/virtio-net.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index 044ac95f6f..7faaa829b6 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -869,6 +869,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");
|
|
--
|
|
2.27.0
|
|
|