qdev: HotplugHandler: rename unplug callback to unplug_request
PATCH 1/1 qdev: HotplugHandler: rename unplug callback to unplug_request
'HotplugHandler.unplug' callback is currently used as async call to issue unplug request from 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 hardware is ready for it.
---
Patch is prompted by reviewing https://patchwork.ozlabs.org/patch/383372/
Dedicated 'unplug' callback could be used by bus-less pc-dimm device. It would allow to call HotplugHandler.unplug callback from ACPI code when guest calls _EJ0 method and execute board specific code (PCMachine) to unmap pc-dimm from guest's address space and perform necessary cleanup.
--- 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 | 12 ++++++------ include/hw/pci/pcie.h | 4 ++-- include/hw/pci/shpc.h | 4 ++-- 11 files changed, 29 insertions(+), 28 deletions(-)
hw/acpi/piix4.c +3 -3
@@ -354,8 +354,8 @@ static void piix4_device_plug_cb(HotplugHandler *hotplug_dev, } } -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 **errp) {PIIX4PMState *s =PIIX4_PM (hotplug_dev);
@@ -615,7 +615,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) dc->cannot_instantiate_with_device_add_yet = true; dc->hotpluggable = false; hc->plug = piix4_device_plug_cb; - hc->unplug = piix4_device_unplug_cb; + hc->unplug_request = piix4_device_unplug_request_cb; adevc->ospm_status = piix4_ospm_status; }
hw/core/hotplug.c +5 -5
@@ -23,14 +23,14 @@ void hotplug_handler_plug(HotplugHandler *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) {HotplugHandlerClass *hdc =HOTPLUG_HANDLER_GET_CLASS (plug_handler); -if (hdc->unplug) { - hdc->unplug (plug_handler, plugged_dev, errp); +if (hdc->unplug_request) { + hdc->unplug_request (plug_handler, plugged_dev, errp); } }
hw/core/qdev.c +2 -1
@@ -227,7 +227,8 @@ void qdev_unplug(DeviceState *dev, Error **errp) qdev_hot_removed = true;if (dev->parent_bus && dev->parent_bus->hotplug_handler) { -hotplug_handler_unplug (dev->parent_bus->hotplug_handler, dev, errp); +hotplug_handler_unplug_request (dev->parent_bus->hotplug_handler, + dev, errp); }else {assert (dc->unplug !=NULL );if (dc->unplug (dev) <0 ) {/* legacy handler */
hw/isa/lpc_ich9.c +3 -3
@@ -607,8 +607,8 @@ static void ich9_device_plug_cb(HotplugHandler *hotplug_dev,ich9_pm_device_plug_cb (&lpc->pm, dev, errp); } -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 device" " type: %s" ,object_get_typename (OBJECT (dev)));
@@ -676,7 +676,7 @@ static void ich9_lpc_class_init(ObjectClass *klass, void *data)*/ dc->cannot_instantiate_with_device_add_yet = true; hc->plug = ich9_device_plug_cb; - hc->unplug = ich9_device_unplug_cb; + hc->unplug_request = ich9_device_unplug_request_cb; adevc->ospm_status = ich9_pm_ospm_status; }
hw/pci-bridge/pci_bridge_dev.c +1 -1
@@ -150,7 +150,7 @@ static void pci_bridge_dev_class_init(ObjectClass *klass, void *data) dc->vmsd = &pci_bridge_dev_vmstate;set_bit (DEVICE_CATEGORY_BRIDGE , dc->categories); hc->plug = shpc_device_hotplug_cb; - hc->unplug = shpc_device_hot_unplug_cb; + hc->unplug_request = shpc_device_hot_unplug_request_cb; }static const TypeInfo pci_bridge_dev_info = {
hw/pci/pcie.c +2 -2
@@ -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); } -void pcie_cap_slot_hot_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev, -Error **errp) +void pcie_cap_slot_hot_unplug_request_cb (HotplugHandler *hotplug_dev, +DeviceState *dev,Error **errp) {uint8_t *exp_cap;
hw/pci/pcie_port.c +1 -1
@@ -154,7 +154,7 @@ static void pcie_slot_class_init(ObjectClass *oc, void *data) dc->props = pcie_slot_props; hc->plug = pcie_cap_slot_hotplug_cb; - hc->unplug = pcie_cap_slot_hot_unplug_cb; + hc->unplug_request = pcie_cap_slot_hot_unplug_request_cb; }static const TypeInfo pcie_slot_type_info = {
hw/pci/shpc.c +2 -2
@@ -549,8 +549,8 @@ void shpc_device_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,shpc_interrupt_update (pci_hotplug_dev); } -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 =NULL ;PCIDevice *pci_hotplug_dev =PCI_DEVICE (hotplug_dev);
include/hw/hotplug.h +6 -6
@@ -55,7 +55,7 @@ typedef struct HotplugHandlerClass {/* <public> */ hotplug_fn plug; -hotplug_fn unplug; +hotplug_fn unplug_request; } HotplugHandlerClass;/**
@@ -68,11 +68,11 @@ void hotplug_handler_plug(HotplugHandler *plug_handler, Error **errp);/** -* 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
include/hw/pci/pcie.h +2 -2
@@ -128,6 +128,6 @@ extern const VMStateDescription vmstate_pcie_device;void pcie_cap_slot_hotplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,Error **errp); -void pcie_cap_slot_hot_unplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev, -Error **errp); +void pcie_cap_slot_hot_unplug_request_cb (HotplugHandler *hotplug_dev, +DeviceState *dev,Error **errp);#endif /* QEMU_PCIE_H */
include/hw/pci/shpc.h +2 -2
@@ -46,8 +46,8 @@ void shpc_cap_write_config(PCIDevice *d, uint32_t addr, uint32_t val, int len);void shpc_device_hotplug_cb (HotplugHandler *hotplug_dev,DeviceState *dev,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);extern VMStateInfo shpc_vmstate_info;#define SHPC_VMSTATE (_field, _type) \
Signature · 1 line
1.8.3.1