mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

failover: We don't need to cache primary_device_id anymore

Browse Source 
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>
This commit is contained in:
Juan Quintela 2020-11-18 09:37:45 +01:00 committed by Michael S. Tsirkin
parent f5e1847ba5
commit 3abad4a221
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/net/virtio-net.c
View File

@ -824,6 +824,7 @@ static char *failover_find_primary_device_id(VirtIONet *n)
Error *err = NULL; Error *err = NULL;
FailoverId fid; FailoverId fid;
fid.n = n;
if (!qemu_opts_foreach(qemu_find_opts("device"), if (!qemu_opts_foreach(qemu_find_opts("device"),
failover_set_primary, &fid, &err)) { failover_set_primary, &fid, &err)) {
return NULL; return NULL;
@ -835,12 +836,17 @@ static void failover_add_primary(VirtIONet *n, Error **errp)
{ {
Error *err = NULL; Error *err = NULL;
QemuOpts *opts; QemuOpts *opts;
char *id;
if (n->primary_dev) { if (n->primary_dev) {
return; 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) { if (opts) {
n->primary_dev = qdev_device_add(opts, &err); n->primary_dev = qdev_device_add(opts, &err);
if (err) { if (err) {
@ -868,9 +874,8 @@ static DeviceState *failover_find_primary_device(VirtIONet *n)
if (!id) { if (!id) {
return NULL; 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) 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), vmstate_unregister(VMSTATE_IF(n->primary_dev),
qdev_get_vmsd(n->primary_dev), qdev_get_vmsd(n->primary_dev),
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); qatomic_set(&n->failover_primary_hidden, true);
} else { } else {
warn_report("couldn't unplug primary device"); warn_report("couldn't unplug primary device");
@ -3186,7 +3191,6 @@ static bool failover_hide_primary_device(DeviceListener *listener,
QemuOpts *device_opts) QemuOpts *device_opts)
{ {
VirtIONet *n = container_of(listener, VirtIONet, primary_listener); VirtIONet *n = container_of(listener, VirtIONet, primary_listener);
bool hide;
const char *standby_id; const char *standby_id;
if (!device_opts) { if (!device_opts) {
@ -3198,10 +3202,7 @@ static bool failover_hide_primary_device(DeviceListener *listener,
} }
/* failover_primary_hidden is set during feature negotiation */ /* failover_primary_hidden is set during feature negotiation */
hide = qatomic_read(&n->failover_primary_hidden); return qatomic_read(&n->failover_primary_hidden);
g_free(n->primary_device_id);
n->primary_device_id = g_strdup(device_opts->id);
return hide;
} }
static void virtio_net_device_realize(DeviceState *dev, Error **errp) 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) { if (n->failover) {
device_listener_unregister(&n->primary_listener); device_listener_unregister(&n->primary_listener);
g_free(n->primary_device_id);
} }
max_queues = n->multiqueue ? n->max_queues : 1; max_queues = n->multiqueue ? n->max_queues : 1;

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

@ -203,7 +203,6 @@ struct VirtIONet {
bool needs_vnet_hdr_swap; bool needs_vnet_hdr_swap;
bool mtu_bypass_backend; bool mtu_bypass_backend;
DeviceState *primary_dev; DeviceState *primary_dev;
char *primary_device_id;
/* primary failover device is hidden*/ /* primary failover device is hidden*/
bool failover_primary_hidden; bool failover_primary_hidden;
bool failover; bool failover;