瀏覽代碼

qdev: Use qdev_realize() in qdev_device_add()

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-56-armbru@redhat.com>
Markus Armbruster 5 年之前
父節點
當前提交
464a22c757
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      qdev-monitor.c

+ 2 - 4
qdev-monitor.c

@@ -661,9 +661,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
         goto err_del_dev;
         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 */
         /* No bus, no machine hotplug handler --> device is not hotpluggable */
         error_setg(&err, "Device '%s' can not be hotplugged on this machine",
         error_setg(&err, "Device '%s' can not be hotplugged on this machine",
                    driver);
                    driver);
@@ -678,7 +676,7 @@ DeviceState *qdev_device_add(QemuOpts *opts, Error **errp)
     }
     }
 
 
     dev->opts = opts;
     dev->opts = opts;
-    object_property_set_bool(OBJECT(dev), true, "realized", &err);
+    qdev_realize(DEVICE(dev), bus, &err);
     if (err != NULL) {
     if (err != NULL) {
         dev->opts = NULL;
         dev->opts = NULL;
         goto err_del_dev;
         goto err_del_dev;