summaryrefslogtreecommitdiffstats
path: root/hw/xen
diff options
context:
space:
mode:
authorDamien Hedde2021-10-08 15:34:36 +0200
committerKevin Wolf2021-10-15 16:08:46 +0200
commit4a1d937796de0fecd8b22d7dbebf87f38e8282fd (patch)
treed5a1911e87468dfd1c492f58572f73969c192cfc /hw/xen
parentqdev: Make DeviceState.id independent of QemuOpts (diff)
downloadqemu-4a1d937796de0fecd8b22d7dbebf87f38e8282fd.tar.gz
qemu-4a1d937796de0fecd8b22d7dbebf87f38e8282fd.tar.xz
qemu-4a1d937796de0fecd8b22d7dbebf87f38e8282fd.zip
softmmu/qdev-monitor: add error handling in qdev_set_id
qdev_set_id() is mostly used when the user adds a device (using -device cli option or device_add qmp command). This commit adds an error parameter to handle the case where the given id is already taken. Also document the function and add a return value in order to be able to capture success/failure: the function now returns the id in case of success, or NULL in case of failure. The commit modifies the 2 calling places (qdev-monitor and xen-legacy-backend) to add the error object parameter. Note that the id is, right now, guaranteed to be unique because all ids came from the "device" QemuOptsList where the id is used as key. This addition is a preparation for a future commit which will relax the uniqueness. Signed-off-by: Damien Hedde <damien.hedde@greensocs.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20211008133442.141332-10-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>
Diffstat (limited to 'hw/xen')
-rw-r--r--hw/xen/xen-legacy-backend.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/xen/xen-legacy-backend.c b/hw/xen/xen-legacy-backend.c
index be3cf4a195..085fd31ef7 100644
--- a/hw/xen/xen-legacy-backend.c
+++ b/hw/xen/xen-legacy-backend.c
@@ -276,7 +276,8 @@ static struct XenLegacyDevice *xen_be_get_xendev(const char *type, int dom,
xendev = g_malloc0(ops->size);
object_initialize(&xendev->qdev, ops->size, TYPE_XENBACKEND);
OBJECT(xendev)->free = g_free;
- qdev_set_id(DEVICE(xendev), g_strdup_printf("xen-%s-%d", type, dev));
+ qdev_set_id(DEVICE(xendev), g_strdup_printf("xen-%s-%d", type, dev),
+ &error_fatal);
qdev_realize(DEVICE(xendev), xen_sysbus, &error_fatal);
object_unref(OBJECT(xendev));