SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

failover: primary bus is only used once, and where it is set

Browse Source 
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>
This commit is contained in:
Juan Quintela 2020-11-18 09:37:25 +01:00 committed by Michael S. Tsirkin
parent 587f2fcb93
commit 78274682b7
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/net/virtio-net.c
View File

@ -804,7 +804,6 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
qemu_opts_del(n->primary_device_opts); qemu_opts_del(n->primary_device_opts);
} }
if (n->primary_dev) { if (n->primary_dev) {
n->primary_bus = n->primary_dev->parent_bus;
if (err) { if (err) {
qdev_unplug(n->primary_dev, &err); qdev_unplug(n->primary_dev, &err);
qdev_set_id(n->primary_dev, ""); qdev_set_id(n->primary_dev, "");
@ -3118,6 +3117,7 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp)
Error *err = NULL; Error *err = NULL;
HotplugHandler *hotplug_ctrl; HotplugHandler *hotplug_ctrl;
PCIDevice *pdev = PCI_DEVICE(n->primary_dev); PCIDevice *pdev = PCI_DEVICE(n->primary_dev);
BusState *primary_bus;
if (!pdev->partially_hotplugged) { if (!pdev->partially_hotplugged) {
return true; return true;
@ -3130,12 +3130,12 @@ static bool failover_replug_primary(VirtIONet *n, Error **errp)
return false; return false;
} }
} }
n->primary_bus = n->primary_dev->parent_bus; primary_bus = n->primary_dev->parent_bus;
if (!n->primary_bus) { if (!primary_bus) {
error_setg(errp, "virtio_net: couldn't find primary bus"); error_setg(errp, "virtio_net: couldn't find primary bus");
return false; 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); qatomic_set(&n->primary_should_be_hidden, false);
if (!qemu_opt_set_bool(n->primary_device_opts, if (!qemu_opt_set_bool(n->primary_device_opts,
"partially_hotplugged", true, errp)) { "partially_hotplugged", true, errp)) {

1
include/hw/virtio/virtio-net.h
View File

@ -205,7 +205,6 @@ struct VirtIONet {
QemuOpts *primary_device_opts; QemuOpts *primary_device_opts;
QDict *primary_device_dict; QDict *primary_device_dict;
DeviceState *primary_dev; DeviceState *primary_dev;
BusState *primary_bus;
char *primary_device_id; char *primary_device_id;
char *standby_id; char *standby_id;
bool primary_should_be_hidden; bool primary_should_be_hidden;