haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

failover: remove standby_id variable

Browse source 
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>
This commit is contained in:
Juan Quintela 2020-11-18 09:37:32 +01:00 committed by Michael S. Tsirkin
parent 19e49bc2e9
commit 4f0303aed8
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hw/net/virtio-net.c
View file

@ -3181,23 +3181,19 @@ static int virtio_net_primary_should_be_hidden(DeviceListener *listener,
VirtIONet *n = container_of(listener, VirtIONet, primary_listener); VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
bool match_found = false; bool match_found = false;
bool hide = false; bool hide = false;
const char *standby_id;
if (!device_opts) { if (!device_opts) {
return -1; return -1;
} }
n->primary_device_dict = qemu_opts_to_qdict(device_opts, n->primary_device_dict = qemu_opts_to_qdict(device_opts,
n->primary_device_dict); n->primary_device_dict);
if (n->primary_device_dict) { standby_id = qemu_opt_get(device_opts, "failover_pair_id");
g_free(n->standby_id); if (g_strcmp0(standby_id, n->netclient_name) == 0) {
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) {
match_found = true; match_found = true;
} else { } else {
match_found = false; match_found = false;
hide = false; hide = false;
g_free(n->standby_id);
n->primary_device_dict = NULL; n->primary_device_dict = NULL;
goto out; goto out;
} }
@ -3400,7 +3396,6 @@ static void virtio_net_device_unrealize(DeviceState *dev)
if (n->failover) { if (n->failover) {
device_listener_unregister(&n->primary_listener); device_listener_unregister(&n->primary_listener);
g_free(n->primary_device_id); g_free(n->primary_device_id);
g_free(n->standby_id);
qobject_unref(n->primary_device_dict); qobject_unref(n->primary_device_dict);
n->primary_device_dict = NULL; n->primary_device_dict = NULL;
} }

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

@ -205,7 +205,6 @@ struct VirtIONet {
QDict *primary_device_dict; QDict *primary_device_dict;
DeviceState *primary_dev; DeviceState *primary_dev;
char *primary_device_id; char *primary_device_id;
char *standby_id;
/* primary failover device is hidden*/ /* primary failover device is hidden*/
bool failover_primary_hidden; bool failover_primary_hidden;
bool failover; bool failover;