Commit 32900679 authored by Juan Quintela's avatar Juan Quintela
Browse files

qdev: Move qdev_unplug() to qdev-monitor.c 



It is not used by linux-user, otherwise I need to to create one stub
for migration_is_idle() on following patch.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarzhanghailiang <zhang.zhanghailiang@huawei.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 21def24a

hw/core/qdev.c

+0 −34
Original line number Diff line number Diff line
@@ -271,40 +271,6 @@ HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) 
    return hotplug_ctrl;

}



void qdev_unplug(DeviceState *dev, Error **errp)

{

    DeviceClass *dc = DEVICE_GET_CLASS(dev);

    HotplugHandler *hotplug_ctrl;

    HotplugHandlerClass *hdc;



    if (dev->parent_bus && !qbus_is_hotpluggable(dev->parent_bus)) {

        error_setg(errp, QERR_BUS_NO_HOTPLUG, dev->parent_bus->name);

        return;

    }



    if (!dc->hotpluggable) {

        error_setg(errp, QERR_DEVICE_NO_HOTPLUG,

                   object_get_typename(OBJECT(dev)));

        return;

    }



    qdev_hot_removed = true;



    hotplug_ctrl = qdev_get_hotplug_handler(dev);

    /* hotpluggable device MUST have HotplugHandler, if it doesn't

     * then something is very wrong with it */

    g_assert(hotplug_ctrl);



    /* If device supports async unplug just request it to be done,

     * otherwise just remove it synchronously */

    hdc = HOTPLUG_HANDLER_GET_CLASS(hotplug_ctrl);

    if (hdc->unplug_request) {

        hotplug_handler_unplug_request(hotplug_ctrl, dev, errp);

    } else {

        hotplug_handler_unplug(hotplug_ctrl, dev, errp);

    }

}



static int qdev_reset_one(DeviceState *dev, void *opaque)

{

    device_reset(dev);

qdev-monitor.c

+34 −0
Original line number Diff line number Diff line
@@ -836,6 +836,40 @@ static DeviceState *find_device_state(const char *id, Error **errp) 
    return DEVICE(obj);

}



void qdev_unplug(DeviceState *dev, Error **errp)

{

    DeviceClass *dc = DEVICE_GET_CLASS(dev);

    HotplugHandler *hotplug_ctrl;

    HotplugHandlerClass *hdc;



    if (dev->parent_bus && !qbus_is_hotpluggable(dev->parent_bus)) {

        error_setg(errp, QERR_BUS_NO_HOTPLUG, dev->parent_bus->name);

        return;

    }



    if (!dc->hotpluggable) {

        error_setg(errp, QERR_DEVICE_NO_HOTPLUG,

                   object_get_typename(OBJECT(dev)));

        return;

    }



    qdev_hot_removed = true;



    hotplug_ctrl = qdev_get_hotplug_handler(dev);

    /* hotpluggable device MUST have HotplugHandler, if it doesn't

     * then something is very wrong with it */

    g_assert(hotplug_ctrl);



    /* If device supports async unplug just request it to be done,

     * otherwise just remove it synchronously */

    hdc = HOTPLUG_HANDLER_GET_CLASS(hotplug_ctrl);

    if (hdc->unplug_request) {

        hotplug_handler_unplug_request(hotplug_ctrl, dev, errp);

    } else {

        hotplug_handler_unplug(hotplug_ctrl, dev, errp);

    }

}



void qmp_device_del(const char *id, Error **errp)

{

    DeviceState *dev = find_device_state(id, errp);