Commit 464a22c7 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qdev: Use qdev_realize() in qdev_device_add() 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-56-armbru@redhat.com>
parent 510ef98d

qdev-monitor.c

+2 −4
Original line number Diff line number Diff line
@@ -661,9 +661,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) 
        goto err_del_dev;

    }



    if (bus) {

        qdev_set_parent_bus(dev, bus);

    } else if (qdev_hotplug && !qdev_get_machine_hotplug_handler(dev)) {

    if (!bus && qdev_hotplug && !qdev_get_machine_hotplug_handler(dev)) {

        /* No bus, no machine hotplug handler --> device is not hotpluggable */

        error_setg(&err, "Device '%s' can not be hotplugged on this machine",

                   driver);
@@ -678,7 +676,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp) 
    }



    dev->opts = opts;

    object_property_set_bool(OBJECT(dev), true, "realized", &err);

    qdev_realize(DEVICE(dev), bus, &err);

    if (err != NULL) {

        dev->opts = NULL;

        goto err_del_dev;