97 lines
3.5 KiB
Diff
97 lines
3.5 KiB
Diff
From 277c3c13377cc7f41d4121fdce918df3005fc063 Mon Sep 17 00:00:00 2001
|
|
From: Laurent Vivier <lvivier@redhat.com>
|
|
Date: Thu, 25 Feb 2021 23:14:31 -0500
|
|
Subject: [PATCH 34/54] failover: Remove primary_device_dict
|
|
|
|
RH-Author: Laurent Vivier <lvivier@redhat.com>
|
|
Message-id: <20210225231447.2187738-12-lvivier@redhat.com>
|
|
Patchwork-id: 101262
|
|
O-Subject: [RHEL-AV-8.4.0 qemu-kvm PATCH v2 11/27] failover: Remove primary_device_dict
|
|
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
|
|
|
|
It was only used once. And we have there opts->id, so no need for it.
|
|
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Message-Id: <20201118083748.1328-13-quintela@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
(cherry picked from commit 9673a88e97d1eb428872bd261dbf56a0f3c2fd71)
|
|
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
|
---
|
|
hw/net/virtio-net.c | 17 ++++-------------
|
|
include/hw/virtio/virtio-net.h | 1 -
|
|
2 files changed, 4 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
|
|
index 953d5c2bc8..6e5a56a230 100644
|
|
--- a/hw/net/virtio-net.c
|
|
+++ b/hw/net/virtio-net.c
|
|
@@ -3186,28 +3186,21 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
|
|
if (!device_opts) {
|
|
return -1;
|
|
}
|
|
- n->primary_device_dict = qemu_opts_to_qdict(device_opts,
|
|
- n->primary_device_dict);
|
|
standby_id = qemu_opt_get(device_opts, "failover_pair_id");
|
|
if (g_strcmp0(standby_id, n->netclient_name) == 0) {
|
|
match_found = true;
|
|
} else {
|
|
match_found = false;
|
|
hide = false;
|
|
- n->primary_device_dict = NULL;
|
|
goto out;
|
|
}
|
|
|
|
/* failover_primary_hidden is set during feature negotiation */
|
|
hide = qatomic_read(&n->failover_primary_hidden);
|
|
-
|
|
- if (n->primary_device_dict) {
|
|
- g_free(n->primary_device_id);
|
|
- n->primary_device_id = g_strdup(qdict_get_try_str(
|
|
- n->primary_device_dict, "id"));
|
|
- if (!n->primary_device_id) {
|
|
- warn_report("primary_device_id not set");
|
|
- }
|
|
+ g_free(n->primary_device_id);
|
|
+ n->primary_device_id = g_strdup(device_opts->id);
|
|
+ if (!n->primary_device_id) {
|
|
+ warn_report("primary_device_id not set");
|
|
}
|
|
|
|
out:
|
|
@@ -3396,8 +3389,6 @@ static void virtio_net_device_unrealize(DeviceState *dev)
|
|
if (n->failover) {
|
|
device_listener_unregister(&n->primary_listener);
|
|
g_free(n->primary_device_id);
|
|
- qobject_unref(n->primary_device_dict);
|
|
- n->primary_device_dict = NULL;
|
|
}
|
|
|
|
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 a055f39dd6..fe353d8299 100644
|
|
--- a/include/hw/virtio/virtio-net.h
|
|
+++ b/include/hw/virtio/virtio-net.h
|
|
@@ -202,7 +202,6 @@ struct VirtIONet {
|
|
AnnounceTimer announce_timer;
|
|
bool needs_vnet_hdr_swap;
|
|
bool mtu_bypass_backend;
|
|
- QDict *primary_device_dict;
|
|
DeviceState *primary_dev;
|
|
char *primary_device_id;
|
|
/* primary failover device is hidden*/
|
|
--
|
|
2.27.0
|
|
|