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

virtio-net: Avoid QemuOpts in failover_find_primary_device()

Browse Source 
Don't go through the global QemuOptsList, it is state of the legacy
command line parser and we will create devices that are not contained
in it. It is also just the command line configuration and not
necessarily the current runtime state.

Instead, look at the qdev device tree which has the current state of all
existing devices.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20211008133442.141332-14-kwolf@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2021-10-08 15:34:40 +02:00
parent 259a10dbcb
commit 12b2fad7dc
1 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,48 +796,34 @@ static inline uint64_t virtio_net_supported_guest_offloads(VirtIONet *n)
typedef struct { typedef struct {
VirtIONet *n; VirtIONet *n;
char *id; DeviceState *dev;
} FailoverId; } FailoverDevice;
/** /**
* Set the id of the failover primary device * Set the failover primary device
* *
* @opaque: FailoverId to setup * @opaque: FailoverId to setup
* @opts: opts for device we are handling * @opts: opts for device we are handling
* @errp: returns an error if this function fails * @errp: returns an error if this function fails
*/ */
static int failover_set_primary(void *opaque, QemuOpts *opts, Error **errp) static int failover_set_primary(DeviceState *dev, void *opaque)
{ {
FailoverId *fid = opaque; FailoverDevice *fdev = opaque;
const char *standby_id = qemu_opt_get(opts, "failover_pair_id"); PCIDevice *pci_dev = (PCIDevice *)
object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE);
if (g_strcmp0(standby_id, fid->n->netclient_name) == 0) { if (!pci_dev) {
fid->id = g_strdup(opts->id); return 0;
}
if (!g_strcmp0(pci_dev->failover_pair_id, fdev->n->netclient_name)) {
fdev->dev = dev;
return 1; return 1;
} }
return 0; return 0;
} }
/**
* Find the primary device id for this failover virtio-net
*
* @n: VirtIONet device
* @errp: returns an error if this function fails
*/
static char *failover_find_primary_device_id(VirtIONet *n)
{
Error *err = NULL;
FailoverId fid;
fid.n = n;
if (!qemu_opts_foreach(qemu_find_opts("device"),
failover_set_primary, &fid, &err)) {
return NULL;
}
return fid.id;
}
/** /**
* Find the primary device for this failover virtio-net * Find the primary device for this failover virtio-net
* *
@ -846,13 +832,13 @@ static char *failover_find_primary_device_id(VirtIONet *n)
*/ */
static DeviceState *failover_find_primary_device(VirtIONet *n) static DeviceState *failover_find_primary_device(VirtIONet *n)
{ {
char *id = failover_find_primary_device_id(n); FailoverDevice fdev = {
.n = n,
};
if (!id) { qbus_walk_children(sysbus_get_default(), failover_set_primary, NULL,
return NULL; NULL, NULL, &fdev);
} return fdev.dev;
return qdev_find_recursive(sysbus_get_default(), id);
} }
static void failover_add_primary(VirtIONet *n, Error **errp) static void failover_add_primary(VirtIONet *n, Error **errp)