From 181a2c63236966b3c80eef131bac33a355a492da Mon Sep 17 00:00:00 2001 From: Igor Mammedov Date: Fri, 26 Sep 2014 09:28:20 +0000 Subject: qdev: HotplugHandler: Provide unplug callback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is to be called for actual device removal and will allow to separate request and removal handling phases of x86-CPU devices and also it's a handler to be called for synchronously removable devices. Signed-off-by: Igor Mammedov Reviewed-by: Paolo Bonzini Signed-off-by: Andreas Färber --- hw/core/qdev.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'hw/core/qdev.c') diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 87ed438475..6479194498 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -227,8 +227,17 @@ void qdev_unplug(DeviceState *dev, Error **errp) qdev_hot_removed = true; if (dev->parent_bus && dev->parent_bus->hotplug_handler) { - hotplug_handler_unplug_request(dev->parent_bus->hotplug_handler, - dev, errp); + HotplugHandlerClass *hdc; + + /* If device supports async unplug just request it to be done, + * otherwise just remove it synchronously */ + hdc = HOTPLUG_HANDLER_GET_CLASS(dev->parent_bus->hotplug_handler); + if (hdc->unplug_request) { + hotplug_handler_unplug_request(dev->parent_bus->hotplug_handler, + dev, errp); + } else { + hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev, errp); + } } else { assert(dc->unplug != NULL); if (dc->unplug(dev) < 0) { /* legacy handler */ -- cgit v1.2.3