[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/55] qdev: Convert to qdev_unrealize() manually
From: |
Markus Armbruster |
Subject: |
[PATCH 07/55] qdev: Convert to qdev_unrealize() manually |
Date: |
Tue, 19 May 2020 16:55:03 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
include/hw/qdev-core.h | 1 -
hw/core/qdev.c | 14 +++++++-------
2 files changed, 7 insertions(+), 8 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 0f4adac865..cb7efae487 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);
}
/*
@@ -493,6 +493,11 @@ bool qdev_realize(DeviceState *dev, BusState *bus, Error
**errp)
return !err;
}
+void qdev_unrealize(DeviceState *dev)
+{
+ object_property_set_bool(OBJECT(dev), false, "realized", &error_abort);
+}
+
/*
* Realize @dev and drop a reference.
* This is like qdev_realize(), except it steals a reference rather
@@ -512,11 +517,6 @@ bool qdev_realize_and_unref(DeviceState *dev, BusState
*bus, Error **errp)
return ret;
}
-void qdev_unrealize(DeviceState *dev)
-{
- object_property_set_bool(OBJECT(dev), false, "realized", &error_abort);
-}
-
static int qdev_assert_realized_properly(Object *obj, void *opaque)
{
DeviceState *dev = DEVICE(object_dynamic_cast(obj, TYPE_DEVICE));
@@ -1187,7 +1187,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.21.1
- [PATCH 00/55] qdev: Rework how we plug into the parent bus, Markus Armbruster, 2020/05/19
- [PATCH 04/55] qdev: Put qdev_new() to use with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 01/55] qdev: Rename qbus_realize() to qbus_init(), Markus Armbruster, 2020/05/19
- [PATCH 02/55] qdev: Drop redundant bus realization, Markus Armbruster, 2020/05/19
- [PATCH 05/55] qdev: Convert to qbus_realize(), qbus_unrealize(), Markus Armbruster, 2020/05/19
- [PATCH 07/55] qdev: Convert to qdev_unrealize() manually,
Markus Armbruster <=
- [PATCH 06/55] qdev: Convert to qdev_unrealize() with Coccinelle, Markus Armbruster, 2020/05/19
- [PATCH 13/55] hw/ppc: Eliminate two superfluous QOM casts, Markus Armbruster, 2020/05/19
- [PATCH 19/55] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/05/19
- [PATCH 20/55] isa: isa_create(), isa_try_create() are now unused, drop, Markus Armbruster, 2020/05/19
- [PATCH 09/55] qdev: Convert uses of qdev_create() manually, Markus Armbruster, 2020/05/19
- [PATCH 31/55] auxbus: Convert a use of qdev_set_parent_bus(), Markus Armbruster, 2020/05/19
- [PATCH 23/55] ssi: Convert last use of ssi_create_slave_no_init() manually, Markus Armbruster, 2020/05/19