[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RESEND v3 08/58] qdev: Convert to qdev_unrealize() manually
From: |
Markus Armbruster |
Subject: |
[PATCH RESEND v3 08/58] qdev: Convert to qdev_unrealize() manually |
Date: |
Wed, 10 Jun 2020 07:31:57 +0200 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@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
- [PATCH RESEND v3 00/58] qdev: Rework how we plug into the parent bus, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 08/58] qdev: Convert to qdev_unrealize() manually,
Markus Armbruster <=
- [PATCH RESEND v3 06/58] qdev: Convert to qbus_realize(), qbus_unrealize(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 12/58] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 20/58] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 18/58] isa: New isa_new(), isa_realize_and_unref() etc., Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 01/58] qdev: Rename qbus_realize() to qbus_init(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 05/58] qdev: Put qdev_new() to use with Coccinelle, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 03/58] Revert "hw/versatile: realize the PCI root bus as part of the versatile init", Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 07/58] qdev: Convert to qdev_unrealize() with Coccinelle, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 14/58] hw/ppc: Eliminate two superfluous QOM casts, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 10/58] qdev: Convert uses of qdev_create() manually, Markus Armbruster, 2020/06/10