129 lines
4.6 KiB
Diff
129 lines
4.6 KiB
Diff
From 845e4811506c58b8f1f4cfcb183994f1d0f4d66b Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Thu, 25 Feb 2021 23:14:43 -0500
|
|
Subject: [PATCH 46/54] failover: We don't need to cache primary_device_id
|
|
anymore
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: <20210225231447.2187738-24-lvivier@redhat.com>
|
|
Patchwork-id: 101258
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 23/27] failover: We don't need to cache primary_device_id anymore
|
|
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>
|
|
|
|
From: Juan Quintela <quintela@redhat.com>
|
|
|
|
BZ: https://bugzilla.redhat.com/1819991
|
|
BRANCH: rhel-av-8.4.0
|
|
UPSTREAM: Merged
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Message-Id: <20201118083748.1328-25-quintela@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 3abad4a221e050d43fa8540677b285057642baaf)
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/net/virtio-net.c | 20 ++++++++++----------
|
|
include/hw/virtio/virtio-net.h | 1 -
|
|
2 files changed, 10 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index 2c502c13fd..746ed3fb71 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -824,6 +824,7 @@ static char *failover_find_primary_device_id(VirtIONet *n)
|
|
Error *err = NULL;
|
|
FailoverId fid;
|
|
|
|
+ fid.n = n;
|
|
if (!qemu_opts_foreach(qemu_find_opts("device"),
|
|
failover_set_primary, &fid, &err)) {
|
|
return NULL;
|
|
@@ -835,12 +836,17 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
|
|
{
|
|
Error *err = NULL;
|
|
QemuOpts *opts;
|
|
+ char *id;
|
|
|
|
if (n->primary_dev) {
|
|
return;
|
|
}
|
|
|
|
- opts = qemu_opts_find(qemu_find_opts("device"), n->primary_device_id);
|
|
+ id = failover_find_primary_device_id(n);
|
|
+ if (!id) {
|
|
+ return;
|
|
+ }
|
|
+ opts = qemu_opts_find(qemu_find_opts("device"), id);
|
|
if (opts) {
|
|
n->primary_dev = qdev_device_add(opts, &err);
|
|
if (err) {
|
|
@@ -868,9 +874,8 @@ static DeviceState *failover_find_primary_device(VirtIONet *n)
|
|
if (!id) {
|
|
return NULL;
|
|
}
|
|
- n->primary_device_id = g_strdup(id);
|
|
|
|
- return qdev_find_recursive(sysbus_get_default(), n->primary_device_id);
|
|
+ return qdev_find_recursive(sysbus_get_default(), id);
|
|
}
|
|
|
|
static void virtio_net_set_features(VirtIODevice *vdev, uint64_t features)
|
|
@@ -3160,7 +3165,7 @@ static void virtio_net_handle_migration_primary(VirtIONet *n,
|
|
vmstate_unregister(VMSTATE_IF(n->primary_dev),
|
|
qdev_get_vmsd(n->primary_dev),
|
|
n->primary_dev);
|
|
- qapi_event_send_unplug_primary(n->primary_device_id);
|
|
+ qapi_event_send_unplug_primary(n->primary_dev->id);
|
|
qatomic_set(&n->failover_primary_hidden, true);
|
|
} else {
|
|
warn_report("couldn't unplug primary device");
|
|
@@ -3186,7 +3191,6 @@ static bool failover_hide_primary_device(DeviceListener *listener,
|
|
QemuOpts *device_opts)
|
|
{
|
|
VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
|
|
- bool hide;
|
|
const char *standby_id;
|
|
|
|
if (!device_opts) {
|
|
@@ -3198,10 +3202,7 @@ static bool failover_hide_primary_device(DeviceListener *listener,
|
|
}
|
|
|
|
/* failover_primary_hidden is set during feature negotiation */
|
|
- hide = qatomic_read(&n->failover_primary_hidden);
|
|
- g_free(n->primary_device_id);
|
|
- n->primary_device_id = g_strdup(device_opts->id);
|
|
- return hide;
|
|
+ return qatomic_read(&n->failover_primary_hidden);
|
|
}
|
|
|
|
static void virtio_net_device_realize(DeviceState *dev, Error **errp)
|
|
@@ -3378,7 +3379,6 @@ static void virtio_net_device_unrealize(DeviceState *dev)
|
|
|
|
if (n->failover) {
|
|
device_listener_unregister(&n->primary_listener);
|
|
- g_free(n->primary_device_id);
|
|
}
|
|
|
|
max_queues = n->multiqueue ? n->max_queues : 1;
|
|
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
|
|
index fe353d8299..efef64e02f 100644
|
|
--- a/include/hw/virtio/virtio-net.h
|
|
+++ b/include/hw/virtio/virtio-net.h
|
|
@@ -203,7 +203,6 @@ struct VirtIONet {
|
|
bool needs_vnet_hdr_swap;
|
|
bool mtu_bypass_backend;
|
|
DeviceState *primary_dev;
|
|
- char *primary_device_id;
|
|
/* primary failover device is hidden*/
|
|
bool failover_primary_hidden;
|
|
bool failover;
|
|
--
|
|
2.27.0
|
|
|