[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/66] failover: primary bus is only used once, and where it is se
From: |
Michael S. Tsirkin |
Subject: |
[PULL 19/66] failover: primary bus is only used once, and where it is set |
Date: |
Tue, 8 Dec 2020 14:34:35 -0500 |
From: Juan Quintela <quintela@redhat.com>
Just remove the struct member.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20201118083748.1328-5-quintela@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/virtio/virtio-net.h | 1 -
hw/net/virtio-net.c | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
index f4852ac27b..c8da637d40 100644
--- a/include/hw/virtio/virtio-net.h
+++ b/include/hw/virtio/virtio-net.h
@@ -205,7 +205,6 @@ struct VirtIONet {
QemuOpts *primary_device_opts;
QDict *primary_device_dict;
DeviceState *primary_dev;
- BusState *primary_bus;
char *primary_device_id;
char *standby_id;
bool primary_should_be_hidden;
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index a0fa63e7cb..786d313330 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -804,7 +804,6 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
qemu_opts_del(n->primary_device_opts);
}
if (n->primary_dev) {
- n->primary_bus = n->primary_dev->parent_bus;
if (err) {
qdev_unplug(n->primary_dev, &err);
qdev_set_id(n->primary_dev, "");
@@ -3118,6 +3117,7 @@ static bool failover_replug_primary(VirtIONet *n, Error
**errp)
Error *err = NULL;
HotplugHandler *hotplug_ctrl;
PCIDevice *pdev = PCI_DEVICE(n->primary_dev);
+ BusState *primary_bus;
if (!pdev->partially_hotplugged) {
return true;
@@ -3130,12 +3130,12 @@ static bool failover_replug_primary(VirtIONet *n, Error
**errp)
return false;
}
}
- n->primary_bus = n->primary_dev->parent_bus;
- if (!n->primary_bus) {
+ primary_bus = n->primary_dev->parent_bus;
+ if (!primary_bus) {
error_setg(errp, "virtio_net: couldn't find primary bus");
return false;
}
- qdev_set_parent_bus(n->primary_dev, n->primary_bus, &error_abort);
+ qdev_set_parent_bus(n->primary_dev, primary_bus, &error_abort);
qatomic_set(&n->primary_should_be_hidden, false);
if (!qemu_opt_set_bool(n->primary_device_opts,
"partially_hotplugged", true, errp)) {
--
MST
- [PULL 12/66] acpi/gpex: Build tables for pxb, (continued)
- [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, 2020/12/08
- [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 <=
- [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
- [PULL 28/66] failover: Remove memory leak, Michael S. Tsirkin, 2020/12/08
- [PULL 30/66] failover: should_be_hidden() should take a bool, Michael S. Tsirkin, 2020/12/08
- [PULL 32/66] failover: virtio_net_connect_failover_devices() does nothing, Michael S. Tsirkin, 2020/12/08
- [PULL 31/66] failover: Rename function to hide_device(), Michael S. Tsirkin, 2020/12/08