From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeEy0-0005yg-4J for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeExt-0004lj-9O for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:36 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49304 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeExs-0004fZ-W4 for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:29 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 15 Oct 2014 05:08:53 +0200 Message-Id: <1413342561-4754-20-git-send-email-afaerber@suse.de> In-Reply-To: <1413342561-4754-1-git-send-email-afaerber@suse.de> References: <1413342561-4754-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 19/47] qdev: HotplugHandler: Rename unplug callback to unplug_request List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori , "Michael S. Tsirkin" From: Igor Mammedov 'HotplugHandler.unplug' callback is currently used as async call to issue unplug request for device that implements it. Renaming 'unplug' callback to 'unplug_request' should help to avoid confusion about what callback does and would allow to introduce 'unplug' callback that would perform actual device removal when guest is ready for it. Signed-off-by: Igor Mammedov Reviewed-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- hw/acpi/piix4.c | 6 +++--- hw/core/hotplug.c | 10 +++++----- hw/core/qdev.c | 3 ++- hw/isa/lpc_ich9.c | 6 +++--- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci/pcie.c | 4 ++-- hw/pci/pcie_port.c | 2 +- hw/pci/shpc.c | 4 ++-- include/hw/hotplug.h | 16 +++++++++------- include/hw/pci/pcie.h | 4 ++-- include/hw/pci/shpc.h | 4 ++-- 11 files changed, 32 insertions(+), 29 deletions(-) diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index b72b34e..0bfa814 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -354,8 +354,8 @@ static void piix4_device_plug_cb(HotplugHandler *hotp= lug_dev, } } =20 -static void piix4_device_unplug_cb(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void piix4_device_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **err= p) { PIIX4PMState *s =3D PIIX4_PM(hotplug_dev); =20 @@ -615,7 +615,7 @@ static void piix4_pm_class_init(ObjectClass *klass, v= oid *data) dc->cannot_instantiate_with_device_add_yet =3D true; dc->hotpluggable =3D false; hc->plug =3D piix4_device_plug_cb; - hc->unplug =3D piix4_device_unplug_cb; + hc->unplug_request =3D piix4_device_unplug_request_cb; adevc->ospm_status =3D piix4_ospm_status; } =20 diff --git a/hw/core/hotplug.c b/hw/core/hotplug.c index 5573d9d..2ec4736 100644 --- a/hw/core/hotplug.c +++ b/hw/core/hotplug.c @@ -23,14 +23,14 @@ void hotplug_handler_plug(HotplugHandler *plug_handle= r, } } =20 -void hotplug_handler_unplug(HotplugHandler *plug_handler, - DeviceState *plugged_dev, - Error **errp) +void hotplug_handler_unplug_request(HotplugHandler *plug_handler, + DeviceState *plugged_dev, + Error **errp) { HotplugHandlerClass *hdc =3D HOTPLUG_HANDLER_GET_CLASS(plug_handler)= ; =20 - if (hdc->unplug) { - hdc->unplug(plug_handler, plugged_dev, errp); + if (hdc->unplug_request) { + hdc->unplug_request(plug_handler, plugged_dev, errp); } } =20 diff --git a/hw/core/qdev.c b/hw/core/qdev.c index df97003..87ed438 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -227,7 +227,8 @@ void qdev_unplug(DeviceState *dev, Error **errp) qdev_hot_removed =3D true; =20 if (dev->parent_bus && dev->parent_bus->hotplug_handler) { - hotplug_handler_unplug(dev->parent_bus->hotplug_handler, dev, er= rp); + hotplug_handler_unplug_request(dev->parent_bus->hotplug_handler, + dev, errp); } else { assert(dc->unplug !=3D NULL); if (dc->unplug(dev) < 0) { /* legacy handler */ diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 177023b..530b074 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -607,8 +607,8 @@ static void ich9_device_plug_cb(HotplugHandler *hotpl= ug_dev, ich9_pm_device_plug_cb(&lpc->pm, dev, errp); } =20 -static void ich9_device_unplug_cb(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +static void ich9_device_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp= ) { error_setg(errp, "acpi: device unplug request for not supported devi= ce" " type: %s", object_get_typename(OBJECT(dev))); @@ -676,7 +676,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, v= oid *data) */ dc->cannot_instantiate_with_device_add_yet =3D true; hc->plug =3D ich9_device_plug_cb; - hc->unplug =3D ich9_device_unplug_cb; + hc->unplug_request =3D ich9_device_unplug_request_cb; adevc->ospm_status =3D ich9_pm_ospm_status; } =20 diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_de= v.c index 92799d0..252ea5e 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -150,7 +150,7 @@ static void pci_bridge_dev_class_init(ObjectClass *kl= ass, void *data) dc->vmsd =3D &pci_bridge_dev_vmstate; set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories); hc->plug =3D shpc_device_hotplug_cb; - hc->unplug =3D shpc_device_hot_unplug_cb; + hc->unplug_request =3D shpc_device_hot_unplug_request_cb; } =20 static const TypeInfo pci_bridge_dev_info =3D { diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index 1babddf..b64a004 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -262,8 +262,8 @@ void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug= _dev, DeviceState *dev, PCI_EXP_HP_EV_PDC | PCI_EXP_HP_EV_ABP); } =20 -void pcie_cap_slot_hot_unplug_cb(HotplugHandler *hotplug_dev, DeviceStat= e *dev, - Error **errp) +void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { uint8_t *exp_cap; =20 diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c index fa24877..40ca8d5 100644 --- a/hw/pci/pcie_port.c +++ b/hw/pci/pcie_port.c @@ -154,7 +154,7 @@ static void pcie_slot_class_init(ObjectClass *oc, voi= d *data) =20 dc->props =3D pcie_slot_props; hc->plug =3D pcie_cap_slot_hotplug_cb; - hc->unplug =3D pcie_cap_slot_hot_unplug_cb; + hc->unplug_request =3D pcie_cap_slot_hot_unplug_request_cb; } =20 static const TypeInfo pcie_slot_type_info =3D { diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index 1fcb8c4..65b2f51 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -549,8 +549,8 @@ void shpc_device_hotplug_cb(HotplugHandler *hotplug_d= ev, DeviceState *dev, shpc_interrupt_update(pci_hotplug_dev); } =20 -void shpc_device_hot_unplug_cb(HotplugHandler *hotplug_dev, DeviceState = *dev, - Error **errp) +void shpc_device_hot_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { Error *local_err =3D NULL; PCIDevice *pci_hotplug_dev =3D PCI_DEVICE(hotplug_dev); diff --git a/include/hw/hotplug.h b/include/hw/hotplug.h index a6533cb..e397d08 100644 --- a/include/hw/hotplug.h +++ b/include/hw/hotplug.h @@ -47,7 +47,9 @@ typedef void (*hotplug_fn)(HotplugHandler *plug_handler= , * * @parent: Opaque parent interface. * @plug: plug callback. - * @unplug: unplug callback. + * @unplug_request: unplug request callback. + * Used as a means to initiate device unplug for device= s that + * require asynchronous unplug handling. */ typedef struct HotplugHandlerClass { /* */ @@ -55,7 +57,7 @@ typedef struct HotplugHandlerClass { =20 /* */ hotplug_fn plug; - hotplug_fn unplug; + hotplug_fn unplug_request; } HotplugHandlerClass; =20 /** @@ -68,11 +70,11 @@ void hotplug_handler_plug(HotplugHandler *plug_handle= r, Error **errp); =20 /** - * hotplug_handler_unplug: + * hotplug_handler_unplug_request: * - * Call #HotplugHandlerClass.unplug callback of @plug_handler. + * Calls #HotplugHandlerClass.unplug_request callback of @plug_handler. */ -void hotplug_handler_unplug(HotplugHandler *plug_handler, - DeviceState *plugged_dev, - Error **errp); +void hotplug_handler_unplug_request(HotplugHandler *plug_handler, + DeviceState *plugged_dev, + Error **errp); #endif diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index d139d58..b48a7a2 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -128,6 +128,6 @@ extern const VMStateDescription vmstate_pcie_device; =20 void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *= dev, Error **errp); -void pcie_cap_slot_hot_unplug_cb(HotplugHandler *hotplug_dev, DeviceStat= e *dev, - Error **errp); +void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp)= ; #endif /* QEMU_PCIE_H */ diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h index eef1a1a..025bc5b 100644 --- a/include/hw/pci/shpc.h +++ b/include/hw/pci/shpc.h @@ -46,8 +46,8 @@ void shpc_cap_write_config(PCIDevice *d, uint32_t addr,= uint32_t val, int len); =20 void shpc_device_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *de= v, Error **errp); -void shpc_device_hot_unplug_cb(HotplugHandler *hotplug_dev, DeviceState = *dev, - Error **errp); +void shpc_device_hot_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp); =20 extern VMStateInfo shpc_vmstate_info; #define SHPC_VMSTATE(_field, _type) \ --=20 1.8.4.5