[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/8] qdev: Improve qdev_init_nofail()'s error report
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 1/8] qdev: Improve qdev_init_nofail()'s error reporting |
Date: |
Wed, 4 Feb 2015 18:33:01 +0100 |
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>
---
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 2eacac0..416c7a4 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;
- if (qdev_init(dev) < 0) {
- error_report("Initialization of device %s failed", typename);
+ assert(!dev->realized);
+
+ 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);
}
}
--
1.9.3
- [Qemu-devel] [PATCH 0/8] Cleanups around unchecked qdev_init(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 1/8] qdev: Improve qdev_init_nofail()'s error reporting,
Markus Armbruster <=
- [Qemu-devel] [PATCH 2/8] ide/isa: Replace unchecked qdev_init() by qdev_init_nofail(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 3/8] leon3: Replace unchecked qdev_init() by qdev_init_nofail(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 4/8] etsec: Replace qdev_init() by qdev_init_nofail(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 6/8] serial: serial_hds_isa_init() shouldn't fail, Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 8/8] parallel: parallel_hds_isa_init() shouldn't fail, Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 7/8] parallel: Factor out common parallel_hds_isa_init(), Markus Armbruster, 2015/02/04
- [Qemu-devel] [PATCH 5/8] serial: Factor out common serial_hds_isa_init(), Markus Armbruster, 2015/02/04