88 lines
3.2 KiB
Diff
88 lines
3.2 KiB
Diff
|
From 0c0190ed0d933a6900230427c374e4b93faab73b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Date: Thu, 25 Feb 2021 23:14:23 -0500
|
||
|
|
Subject: [PATCH 26/54] failover: primary bus is only used once, and where it
|
||
|
|
is set
|
||
|
|
|
||
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Message-id: <20210225231447.2187738-4-lvivier@redhat.com>
|
||
|
|
Patchwork-id: 101245
|
||
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 03/27] failover: primary bus is only used once, and where it is set
|
||
|
|
Bugzilla: 1819991
|
||
|
|
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
||
|
|
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
|
||
|
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
|
||
|
|
From: Juan Quintela <quintela@redhat.com>
|
||
|
|
|
||
|
|
BZ: https://bugzilla.redhat.com/1819991
|
||
|
|
BRANCH: rhel-av-8.4.0
|
||
|
|
UPSTREAM: Merged
|
||
|
|
|
||
|
|
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>
|
||
|
|
(cherry picked from commit 78274682b79d48e8de76c817c67c3cfbb76dc2ee)
|
||
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
hw/net/virtio-net.c | 8 ++++----
|
||
|
|
include/hw/virtio/virtio-net.h | 1 -
|
||
|
|
2 files changed, 4 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
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)) {
|
||
|
|
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;
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|