[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 26/65] failover: remove standby_id variable
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 26/65] failover: remove standby_id variable |
Date: |
Wed, 9 Dec 2020 13:08:37 -0500 |
From: Juan Quintela <quintela@redhat.com>
We can calculate it, and we only use it once anyways.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20201118083748.1328-12-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 | 11 +++--------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
index 7159e6c0a0..a055f39dd6 100644
--- a/include/hw/virtio/virtio-net.h
+++ b/include/hw/virtio/virtio-net.h
@@ -205,7 +205,6 @@ struct VirtIONet {
QDict *primary_device_dict;
DeviceState *primary_dev;
char *primary_device_id;
- char *standby_id;
/* primary failover device is hidden*/
bool failover_primary_hidden;
bool failover;
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 2a99b0e0f6..953d5c2bc8 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3181,23 +3181,19 @@ static int
virtio_net_primary_should_be_hidden(DeviceListener *listener,
VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
bool match_found = false;
bool hide = false;
+ const char *standby_id;
if (!device_opts) {
return -1;
}
n->primary_device_dict = qemu_opts_to_qdict(device_opts,
n->primary_device_dict);
- if (n->primary_device_dict) {
- g_free(n->standby_id);
- n->standby_id = g_strdup(qdict_get_try_str(n->primary_device_dict,
- "failover_pair_id"));
- }
- if (g_strcmp0(n->standby_id, n->netclient_name) == 0) {
+ 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;
- g_free(n->standby_id);
n->primary_device_dict = NULL;
goto out;
}
@@ -3400,7 +3396,6 @@ static void virtio_net_device_unrealize(DeviceState *dev)
if (n->failover) {
device_listener_unregister(&n->primary_listener);
g_free(n->primary_device_id);
- g_free(n->standby_id);
qobject_unref(n->primary_device_dict);
n->primary_device_dict = NULL;
}
--
MST
- [PULL v2 17/65] failover: fix indentantion, (continued)
- [PULL v2 17/65] failover: fix indentantion, Michael S. Tsirkin, 2020/12/09
- [PULL v2 18/65] failover: Use always atomics for primary_should_be_hidden, Michael S. Tsirkin, 2020/12/09
- [PULL v2 15/65] unit-test: Add testcase for pxb, Michael S. Tsirkin, 2020/12/09
- [PULL v2 20/65] failover: Remove unused parameter, Michael S. Tsirkin, 2020/12/09
- [PULL v2 19/65] failover: primary bus is only used once, and where it is set, Michael S. Tsirkin, 2020/12/09
- [PULL v2 22/65] failover: qdev_device_add() returns err or dev set, Michael S. Tsirkin, 2020/12/09
- [PULL v2 21/65] failover: Remove external partially_hotplugged property, Michael S. Tsirkin, 2020/12/09
- [PULL v2 23/65] failover: Rename bool to failover_primary_hidden, Michael S. Tsirkin, 2020/12/09
- [PULL v2 24/65] failover: g_strcmp0() knows how to handle NULL, Michael S. Tsirkin, 2020/12/09
- [PULL v2 25/65] failover: Remove primary_device_opts, Michael S. Tsirkin, 2020/12/09
- [PULL v2 26/65] failover: remove standby_id variable,
Michael S. Tsirkin <=
- [PULL v2 27/65] failover: Remove primary_device_dict, Michael S. Tsirkin, 2020/12/09
- [PULL v2 28/65] failover: Remove memory leak, Michael S. Tsirkin, 2020/12/09
- [PULL v2 29/65] failover: simplify virtio_net_find_primary(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 30/65] failover: should_be_hidden() should take a bool, Michael S. Tsirkin, 2020/12/09
- [PULL v2 31/65] failover: Rename function to hide_device(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 32/65] failover: virtio_net_connect_failover_devices() does nothing, Michael S. Tsirkin, 2020/12/09
- [PULL v2 33/65] failover: Rename to failover_find_primary_device(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 34/65] failover: simplify qdev_device_add() failover case, Michael S. Tsirkin, 2020/12/09
- [PULL v2 35/65] failover: simplify qdev_device_add(), Michael S. Tsirkin, 2020/12/09
- [PULL v2 36/65] failover: make sure that id always exist, Michael S. Tsirkin, 2020/12/09