On Mon, Nov 05, 2018 at 11:20:42AM +0100, David Hildenbrand wrote: > Introduce and use the "unplug" callback. > > This is a preparation for multi-stage hotplug handlers, whereby the bus > hotplug handler is overwritten by the machine hotplug handler. This handler > will then pass control to the bus hotplug handler. So to get this running > cleanly, we also have to make sure to go via the hotplug handler chain when > actually unplugging a device after an unplug request. Lookup the hotplug > handler and call "unplug". > > Signed-off-by: David Hildenbrand <da...@redhat.com>
Reviewed-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> hw/pci/pcie.c | 10 +++++++++-
> hw/pci/pcie_port.c | 1 +
> include/hw/pci/pcie.h | 2 ++
> 3 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
> index ccba29269e..ba3ea925e9 100644
> --- a/hw/pci/pcie.c
> +++ b/hw/pci/pcie.c
> @@ -364,11 +364,19 @@ void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev,
> DeviceState *dev,
> }
> }
>
> -static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)
> +void pcie_cap_slot_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> + Error **errp)
> {
> object_unparent(OBJECT(dev));
> }
>
> +static void pcie_unplug_device(PCIBus *bus, PCIDevice *dev, void *opaque)
> +{
> + HotplugHandler *hotplug_ctrl = qdev_get_hotplug_handler(DEVICE(dev));
> +
> + hotplug_handler_unplug(hotplug_ctrl, DEVICE(dev), &error_abort);
> +}
> +
> void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp)
> {
> diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c
> index 7982a87880..a30291ef54 100644
> --- a/hw/pci/pcie_port.c
> +++ b/hw/pci/pcie_port.c
> @@ -156,6 +156,7 @@ static void pcie_slot_class_init(ObjectClass *oc, void
> *data)
> dc->props = pcie_slot_props;
> hc->pre_plug = pcie_cap_slot_pre_plug_cb;
> hc->plug = pcie_cap_slot_plug_cb;
> + hc->unplug = pcie_cap_slot_unplug_cb;
> hc->unplug_request = pcie_cap_slot_unplug_request_cb;
> }
>
> diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
> index d9fbcf4a4a..9ae6482658 100644
> --- a/include/hw/pci/pcie.h
> +++ b/include/hw/pci/pcie.h
> @@ -135,6 +135,8 @@ void pcie_cap_slot_pre_plug_cb(HotplugHandler
> *hotplug_dev, DeviceState *dev,
> Error **errp);
> void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> Error **errp);
> +void pcie_cap_slot_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev,
> + Error **errp);
> void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev,
> DeviceState *dev, Error **errp);
> #endif /* QEMU_PCIE_H */
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
