[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/66] failover: qdev_device_add() returns err or dev set
From: |
Michael S. Tsirkin |
Subject: |
[PULL 22/66] failover: qdev_device_add() returns err or dev set |
Date: |
Tue, 8 Dec 2020 14:34:45 -0500 |
From: Juan Quintela <quintela@redhat.com>
Never both.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20201118083748.1328-8-quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/net/virtio-net.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 6ca85627d8..3e82108d42 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -803,13 +803,6 @@ static void failover_add_primary(VirtIONet *n, Error
**errp)
if (err) {
qemu_opts_del(n->primary_device_opts);
}
- if (n->primary_dev) {
- if (err) {
- qdev_unplug(n->primary_dev, &err);
- qdev_set_id(n->primary_dev, "");
-
- }
- }
} else {
error_setg(errp, "Primary device not found");
error_append_hint(errp, "Virtio-net failover will not work. Make "
--
MST
- [PULL 07/66] virtio: reset device on bad guest index in virtio_load(), (continued)
- [PULL 07/66] virtio: reset device on bad guest index in virtio_load(), Michael S. Tsirkin, 2020/12/08
- [PULL 09/66] fw_cfg: Refactor extra pci roots addition, Michael S. Tsirkin, 2020/12/08
- [PULL 10/66] hw/arm/virt: Write extra pci roots into fw_cfg, Michael S. Tsirkin, 2020/12/08
- [PULL 11/66] acpi: Extract crs build form acpi_build.c, Michael S. Tsirkin, 2020/12/08
- [PULL 12/66] acpi/gpex: Build tables for pxb, Michael S. Tsirkin, 2020/12/08
- [PULL 14/66] unit-test: The files changed., Michael S. Tsirkin, 2020/12/08
- [PULL 15/66] unit-test: Add testcase for pxb, Michael S. Tsirkin, 2020/12/08
- [PULL 13/66] acpi: Align the size to 128k, Michael S. Tsirkin, 2020/12/08
- [PULL 17/66] failover: fix indentantion, Michael S. Tsirkin, 2020/12/08
- [PULL 18/66] failover: Use always atomics for primary_should_be_hidden, Michael S. Tsirkin, 2020/12/08
- [PULL 22/66] failover: qdev_device_add() returns err or dev set,
Michael S. Tsirkin <=
- [PULL 24/66] failover: g_strcmp0() knows how to handle NULL, Michael S. Tsirkin, 2020/12/08
- [PULL 25/66] failover: Remove primary_device_opts, Michael S. Tsirkin, 2020/12/08
- [PULL 16/66] unit-test: Add the binary file and clear diff.h, Michael S. Tsirkin, 2020/12/08
- [PULL 19/66] failover: primary bus is only used once, and where it is set, Michael S. Tsirkin, 2020/12/08
- [PULL 21/66] failover: Remove external partially_hotplugged property, Michael S. Tsirkin, 2020/12/08
- [PULL 20/66] failover: Remove unused parameter, Michael S. Tsirkin, 2020/12/08
- [PULL 26/66] failover: remove standby_id variable, Michael S. Tsirkin, 2020/12/08
- [PULL 27/66] failover: Remove primary_device_dict, Michael S. Tsirkin, 2020/12/08
- [PULL 23/66] failover: Rename bool to failover_primary_hidden, Michael S. Tsirkin, 2020/12/08
- [PULL 29/66] failover: simplify virtio_net_find_primary(), Michael S. Tsirkin, 2020/12/08