[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 52/55] qdev: Use qdev_realize() in qdev_device_add()
From: |
Markus Armbruster |
Subject: |
[PATCH 52/55] qdev: Use qdev_realize() in qdev_device_add() |
Date: |
Tue, 19 May 2020 16:55:48 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
qdev-monitor.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/qdev-monitor.c b/qdev-monitor.c
index bbbbf3d907..249d9a2408 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -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;
--
2.21.1
- Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc., (continued)
- Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc., Paolo Bonzini, 2020/05/20
- Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/05/20
- Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc., Paolo Bonzini, 2020/05/20
- Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/05/25
- Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc., Paolo Bonzini, 2020/05/25
Re: [PATCH 03/55] qdev: New qdev_new(), qdev_realize(), etc., Gerd Hoffmann, 2020/05/20
[PATCH 48/55] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4, Markus Armbruster, 2020/05/19
[PATCH 15/55] pci: Convert uses of pci_create() etc. manually, Markus Armbruster, 2020/05/19
[PATCH 54/55] qdev: qdev_init_nofail() is now unused, drop, Markus Armbruster, 2020/05/19
[PATCH 17/55] isa: New isa_new(), isa_realize_and_unref() etc., Markus Armbruster, 2020/05/19
[PATCH 52/55] qdev: Use qdev_realize() in qdev_device_add(),
Markus Armbruster <=
[PATCH 37/55] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls, Markus Armbruster, 2020/05/19
[PATCH 25/55] usb: New usb_new(), usb_realize_and_unref(), Markus Armbruster, 2020/05/19
[PATCH 51/55] qdev: Make qdev_realize() support bus-less devices, Markus Armbruster, 2020/05/19