[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/84] qdev: Convert to qdev_unrealize() manually
From: |
Markus Armbruster |
Subject: |
[PULL 34/84] qdev: Convert to qdev_unrealize() manually |
Date: |
Mon, 15 Jun 2020 22:39:18 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-9-armbru@redhat.com>
---
include/hw/qdev-core.h | 1 -
hw/core/qdev.c | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index fba29308f7..be6f7c4736 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -328,7 +328,6 @@ void qdev_init_nofail(DeviceState *dev);
bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp);
bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp);
void qdev_unrealize(DeviceState *dev);
-
void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
int required_for_version);
HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev);
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index b7355fbcd0..4768244f31 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -421,7 +421,7 @@ static void device_reset_child_foreach(Object *obj,
ResettableChildCallback cb,
void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp)
{
- object_property_set_bool(OBJECT(dev), false, "realized", &error_abort);
+ qdev_unrealize(dev);
}
/*
@@ -1183,7 +1183,7 @@ static void device_unparent(Object *obj)
BusState *bus;
if (dev->realized) {
- object_property_set_bool(obj, false, "realized", &error_abort);
+ qdev_unrealize(dev);
}
while (dev->num_child_bus) {
bus = QLIST_FIRST(&dev->child_bus);
--
2.26.2
- [PULL 50/84] ssi: Convert last use of ssi_create_slave_no_init() manually, (continued)
- [PULL 50/84] ssi: Convert last use of ssi_create_slave_no_init() manually, Markus Armbruster, 2020/06/15
- [PULL 52/84] usb: New usb_new(), usb_realize_and_unref(), Markus Armbruster, 2020/06/15
- [PULL 58/84] auxbus: New aux_bus_realize(), pairing with aux_bus_init(), Markus Armbruster, 2020/06/15
- [PULL 56/84] qdev: qdev_create(), qdev_try_create() are now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 39/84] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/06/15
- [PULL 65/84] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls, Markus Armbruster, 2020/06/15
- [PULL 83/84] qdev: qdev_init_nofail() is now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 54/84] usb: usb_create() is now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 66/84] microbit: Tidy up sysbus_init_child_obj() @child argument, Markus Armbruster, 2020/06/15
- [PULL 72/84] qdev: Drop qdev_realize() support for null bus, Markus Armbruster, 2020/06/15
- [PULL 34/84] qdev: Convert to qdev_unrealize() manually,
Markus Armbruster <=
- [PULL 43/84] pci: pci_create(), pci_create_multifunction() are now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 13/84] pnv/phb4: Delete unused "pnv-phb4-pec-stack" devices, Markus Armbruster, 2020/06/15
- [PULL 55/84] usb: Eliminate usb_try_create_simple(), Markus Armbruster, 2020/06/15
- [PULL 63/84] macio: Convert use of qdev_set_parent_bus(), Markus Armbruster, 2020/06/15
- [PULL 84/84] MAINTAINERS: Make section QOM cover hw/core/*bus.c as well, Markus Armbruster, 2020/06/15
- [PULL 74/84] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2, Markus Armbruster, 2020/06/15
- [PULL 28/84] Revert "hw/prep: realize the PCI root bus as part of the prep init", Markus Armbruster, 2020/06/15
- [PULL 81/84] qdev: Use qdev_realize() in qdev_device_add(), Markus Armbruster, 2020/06/15
- [PULL 12/84] macio: Delete unused "macio-gpio" devices, Markus Armbruster, 2020/06/15
- [PULL 78/84] microbit: Eliminate two local variables in microbit_init(), Markus Armbruster, 2020/06/15