From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXRqR-0001Vw-QZ for qemu-devel@nongnu.org; Fri, 26 Sep 2014 05:29:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XXRqN-0007e5-6v for qemu-devel@nongnu.org; Fri, 26 Sep 2014 05:29:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:19189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XXRqN-0007dD-08 for qemu-devel@nongnu.org; Fri, 26 Sep 2014 05:29:39 -0400 From: Igor Mammedov Date: Fri, 26 Sep 2014 09:28:20 +0000 Message-Id: <1411723721-20484-16-git-send-email-imammedo@redhat.com> In-Reply-To: <1411723721-20484-1-git-send-email-imammedo@redhat.com> References: <1411723721-20484-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH v2 15/36] qdev: HotplugHandler: provide unplug callback List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: cornelia.huck@de.ibm.com, mst@redhat.com, amit.shah@redhat.com, agraf@suse.de, borntraeger@de.ibm.com, kraxel@redhat.com, dmitry@daynix.com, pbonzini@redhat.com, rth@twiddle.net it 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 --- unplug handling for bus-less devices will be added later in this series. v2: - fixup copypast error, s/unplug_request/unplug/ spotted by Tang Chen --- hw/core/hotplug.c | 11 +++++++++++ hw/core/qdev.c | 13 +++++++++++-- include/hw/hotplug.h | 12 ++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c index 2ec4736..4e01074 100644 --- a/hw/core/hotplug.c +++ b/hw/core/hotplug.c @@ -34,6 +34,17 @@ void hotplug_handler_unplug_request(HotplugHandler *plug_handler, } } +void hotplug_handler_unplug(HotplugHandler *plug_handler, + DeviceState *plugged_dev, + Error **errp) +{ + HotplugHandlerClass *hdc = HOTPLUG_HANDLER_GET_CLASS(plug_handler); + + if (hdc->unplug) { + hdc->unplug(plug_handler, plugged_dev, errp); + } +} + static const TypeInfo hotplug_handler_info = { .name = TYPE_HOTPLUG_HANDLER, .parent = TYPE_INTERFACE, diff --git a/hw/core/qdev.c b/hw/core/qdev.c index c98e5db..c89d781 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 */ diff --git a/include/hw/hotplug.h b/include/hw/hotplug.h index e397d08..050d2f0 100644 --- a/include/hw/hotplug.h +++ b/include/hw/hotplug.h @@ -50,6 +50,9 @@ typedef void (*hotplug_fn)(HotplugHandler *plug_handler, * @unplug_request: unplug request callback. * Used as a means to initiate device unplug for devices that * require asynchronous unplug handling. + * @unplug: unplug callback. + * Used for device removal with devices that implement + * asynchronous and synchronous (suprise) removal. */ typedef struct HotplugHandlerClass { /* */ @@ -58,6 +61,7 @@ typedef struct HotplugHandlerClass { /* */ hotplug_fn plug; hotplug_fn unplug_request; + hotplug_fn unplug; } HotplugHandlerClass; /** @@ -77,4 +81,12 @@ void hotplug_handler_plug(HotplugHandler *plug_handler, void hotplug_handler_unplug_request(HotplugHandler *plug_handler, DeviceState *plugged_dev, Error **errp); +/** + * hotplug_handler_unplug: + * + * Calls #HotplugHandlerClass.unplug callback of @plug_handler. + */ +void hotplug_handler_unplug(HotplugHandler *plug_handler, + DeviceState *plugged_dev, + Error **errp); #endif -- 1.8.3.1