[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 15/36] qdev: HotplugHandler: provide unplug callb
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 15/36] qdev: HotplugHandler: provide unplug callback |
Date: |
Fri, 26 Sep 2014 09:28:20 +0000 |
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 <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
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 <address@hidden>
---
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 {
/* <private> */
@@ -58,6 +61,7 @@ typedef struct HotplugHandlerClass {
/* <public> */
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
- [Qemu-devel] [PATCH v2 06/36] test: virtio-blk: check if hot-plug/unplug works, (continued)
- [Qemu-devel] [PATCH v2 06/36] test: virtio-blk: check if hot-plug/unplug works, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 07/36] test: usb: move uhci port test code to libqos/usb.c, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 08/36] test: usb: add port test to uhci unit test, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 09/36] test: usb: generic usb device hotplug, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 10/36] test: usb: usb-storage hotplug test, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 12/36] access BusState.allow_hotplug using wraper qbus_is_hotpluggable(), Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 13/36] qdev: do not allow to instantiate non hotpluggable device with device_add, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 14/36] qdev: HotplugHandler: rename unplug callback to unplug_request, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 15/36] qdev: HotplugHandler: provide unplug callback,
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 16/36] qdev: add simple/generic unplug callback for HotplugHandler, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 18/36] qdev: drop hotplug check from bus_add_child(), Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 17/36] qdev: add wrapper to set BUS as HotplugHandler, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 20/36] virtio-pci: drop BusState.allow_hotplug, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 21/36] virtio-serial: convert to hotplug-handler API, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 22/36] virtio-mmio: drop useless bus->allow_hotplug = 0, Igor Mammedov, 2014/09/26
- [Qemu-devel] [PATCH v2 23/36] s390x: drop not used allow_hotplug in event-facility, Igor Mammedov, 2014/09/26