Commit c4bacafb authored by Markus Armbruster's avatar Markus Armbruster Committed by Andreas Färber
Browse files

qdev: Improve qdev_init_nofail()'s error reporting 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarAndreas Färber <afaerber@suse.de>
parent f824e8ed

hw/core/qdev.c

+8 −3
Original line number Diff line number Diff line
@@ -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);

    }

}