diff options
author | Juan Quintela <quintela@redhat.com> | 2020-11-18 09:37:33 +0100 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2020-12-08 13:48:57 -0500 |
commit | 9673a88e97d1eb428872bd261dbf56a0f3c2fd71 (patch) | |
tree | 011eb669e45e1be71c2a43caf1233748417ca551 /hw | |
parent | 4f0303aed87f83715055e558176046a8a3d9b987 (diff) | |
download | qemu-9673a88e97d1eb428872bd261dbf56a0f3c2fd71.zip qemu-9673a88e97d1eb428872bd261dbf56a0f3c2fd71.tar.gz qemu-9673a88e97d1eb428872bd261dbf56a0f3c2fd71.tar.bz2 |
failover: Remove primary_device_dict
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>
Diffstat (limited to 'hw')
-rw-r--r-- | hw/net/virtio-net.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 953d5c2..6e5a56a 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; |