Commit dc3edf8d authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qdev: Convert to qdev_unrealize() manually 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-9-armbru@redhat.com>
parent 981c3dcd

hw/core/qdev.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

include/hw/qdev-core.h

+0 −1
Original line number Diff line number Diff line
@@ -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);