From: Hu Tao <hu...@cn.fujitsu.com> Implement bus-less device hot-remove in qdev_unplug(). It will call PCMachine callback introduced in previous patch.
Signed-off-by: Hu Tao <hu...@cn.fujitsu.com> Signed-off-by: Tang Chen <tangc...@cn.fujitsu.com> --- hw/core/qdev.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index da1ba48..e365a74 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -228,6 +228,14 @@ void qdev_unplug(DeviceState *dev, Error **errp) if (dev->parent_bus && dev->parent_bus->hotplug_handler) { hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev, errp); + } else if (*errp == NULL) { + HotplugHandler *hotplug_ctrl; + MachineState *machine = MACHINE(qdev_get_machine()); + MachineClass *mc = MACHINE_GET_CLASS(machine); + + hotplug_ctrl = mc->get_hotplug_handler(machine, dev); + if (hotplug_ctrl) + hotplug_handler_unplug(hotplug_ctrl, dev, errp); } else { assert(dc->unplug != NULL); if (dc->unplug(dev) < 0) { /* legacy handler */ -- 1.8.4.2