[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/10] qdev: Improve qdev_init_nofail()'s error repor
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 03/10] qdev: Improve qdev_init_nofail()'s error reporting |
Date: |
Tue, 24 Feb 2015 14:58:23 +0100 |
From: Markus Armbruster <address@hidden>
We get two error messages: a specific one from qdev_init(), and a
generic one from qdev_init_nofail(). The specific one gets suppressed
in QMP context. qdev_init_nofail() failing there is a bug, though.
Cut out the qdev_init() middle-man: realize the device, and on error
exit with a single error message.
Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
hw/core/qdev.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index ff81f67..10bf086 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -373,10 +373,15 @@ void qdev_simple_device_unplug_cb(HotplugHandler
*hotplug_dev,
way is somewhat unclean, and best avoided. */
void qdev_init_nofail(DeviceState *dev)
{
- const char *typename = object_get_typename(OBJECT(dev));
+ Error *err = NULL;
+
+ assert(!dev->realized);
- if (qdev_init(dev) < 0) {
- error_report("Initialization of device %s failed", typename);
+ object_property_set_bool(OBJECT(dev), true, "realized", &err);
+ if (err) {
+ error_report("Initialization of device %s failed: %s",
+ object_get_typename(OBJECT(dev)),
+ error_get_pretty(err));
exit(1);
}
}
--
2.1.4
- [Qemu-devel] [PULL 00/10] QOM devices patch queue 2015-02-24, Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 08/10] serial: serial_hds_isa_init() shouldn't fail, Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 07/10] serial: Factor out common serial_hds_isa_init(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 01/10] qdev: Avoid type assertion in qdev_build_hotpluggable_device_list(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 02/10] qom: Fix typo, 'my_class_init' -> 'derived_class_init', Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 05/10] leon3: Replace unchecked qdev_init() by qdev_init_nofail(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 09/10] parallel: Factor out common parallel_hds_isa_init(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 06/10] etsec: Replace qdev_init() by qdev_init_nofail(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 04/10] ide/isa: Replace unchecked qdev_init() by qdev_init_nofail(), Andreas Färber, 2015/02/24
- [Qemu-devel] [PULL 03/10] qdev: Improve qdev_init_nofail()'s error reporting,
Andreas Färber <=
- [Qemu-devel] [PULL 10/10] parallel: parallel_hds_isa_init() shouldn't fail, Andreas Färber, 2015/02/24
- Re: [Qemu-devel] [PULL 00/10] QOM devices patch queue 2015-02-24, Mark Cave-Ayland, 2015/02/24