qdev: Convert to qdev_unrealize() manually
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>
This commit is contained in:
parent
981c3dcd94
commit
dc3edf8d8a
|
@ -421,7 +421,7 @@ static void device_reset_child_foreach(Object *obj, ResettableChildCallback cb,
|
||||||
void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,
|
void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev,
|
||||||
DeviceState *dev, Error **errp)
|
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;
|
BusState *bus;
|
||||||
|
|
||||||
if (dev->realized) {
|
if (dev->realized) {
|
||||||
object_property_set_bool(obj, false, "realized", &error_abort);
|
qdev_unrealize(dev);
|
||||||
}
|
}
|
||||||
while (dev->num_child_bus) {
|
while (dev->num_child_bus) {
|
||||||
bus = QLIST_FIRST(&dev->child_bus);
|
bus = QLIST_FIRST(&dev->child_bus);
|
||||||
|
|
|
@ -328,7 +328,6 @@ void qdev_init_nofail(DeviceState *dev);
|
||||||
bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp);
|
bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp);
|
||||||
bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp);
|
bool qdev_realize_and_unref(DeviceState *dev, BusState *bus, Error **errp);
|
||||||
void qdev_unrealize(DeviceState *dev);
|
void qdev_unrealize(DeviceState *dev);
|
||||||
|
|
||||||
void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
|
void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
|
||||||
int required_for_version);
|
int required_for_version);
|
||||||
HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev);
|
HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev);
|
||||||
|
|
Loading…
Reference in a new issue