[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/19] qdev_monitor: Simplify error handling in qdev_
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 12/19] qdev_monitor: Simplify error handling in qdev_device_add() |
Date: |
Thu, 18 Jan 2018 00:09:53 -0200 |
From: Thomas Huth <address@hidden>
Instead of doing the clean-ups on errors multiple times, introduce
a jump label at the end of the function that can be used by all
error paths that need this cleanup.
Suggested-by: Igor Mammedov <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
qdev-monitor.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index b4abb4b5ea..2abb80d7e4 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -619,22 +619,22 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
/* set properties */
if (qemu_opt_foreach(opts, set_property, dev, &err)) {
- error_propagate(errp, err);
- object_unparent(OBJECT(dev));
- object_unref(OBJECT(dev));
- return NULL;
+ goto err_del_dev;
}
dev->opts = opts;
object_property_set_bool(OBJECT(dev), true, "realized", &err);
if (err != NULL) {
- error_propagate(errp, err);
dev->opts = NULL;
- object_unparent(OBJECT(dev));
- object_unref(OBJECT(dev));
- return NULL;
+ goto err_del_dev;
}
return dev;
+
+err_del_dev:
+ error_propagate(errp, err);
+ object_unparent(OBJECT(dev));
+ object_unref(OBJECT(dev));
+ return NULL;
}
--
2.14.3
- [Qemu-devel] [PULL 03/19] qemu-options: document missing memory-backend-file options, (continued)
- [Qemu-devel] [PULL 03/19] qemu-options: document missing memory-backend-file options, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 04/19] qemu-options: document memory-backend-ram, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 05/19] numa: fix missing '-numa cpu' in '-help' output, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 07/19] hw/arm/virt: Allow only supported dynamic sysbus devices, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 06/19] machine: Replace has_dynamic_sysbus with list of allowed devices, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 08/19] ppc: e500: Allow only supported dynamic sysbus devices, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 09/19] spapr: Allow only supported dynamic sysbus devices, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 10/19] xen: Add only xen-sysdev to dynamic sysbus device list, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 11/19] q35: Allow only supported dynamic sysbus devices, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 13/19] qdev: Check for the availability of a hotplug controller before adding a device, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 12/19] qdev_monitor: Simplify error handling in qdev_device_add(),
Eduardo Habkost <=
- [Qemu-devel] [PULL 14/19] scripts: Remove fixed entries from the device-crash-test, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 17/19] nvdimm: add 'unarmed' option, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 15/19] hostmem-file: add "align" option, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 16/19] nvdimm: add a macro for property "label-size", Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 18/19] possible_cpus: add CPUArchId::type field, Eduardo Habkost, 2018/01/17
- [Qemu-devel] [PULL 19/19] fw_cfg: fix memory corruption when all fw_cfg slots are used, Eduardo Habkost, 2018/01/17
- Re: [Qemu-devel] [PULL 00/19] machine queue, 2018-01-18, Peter Maydell, 2018/01/18