[Qemu-devel] [PATCH 12/12] spapr_pci: emit hotplug add/remove events during hotplug

[Michael Roth <mdroth@linux.vnet.ibm.com>]

From: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>

This uses extension of existing EPOW interrupt/event mechanism
to notify userspace tools like librtas/drmgr to handle
in-guest configuration/cleanup operations in response to
device_add/device_del.

Userspace tools that don't implement this extension will need
to be run manually in response/advance of device_add/device_del,
respectively.

Signed-off-by: Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 hw/ppc/spapr_pci.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 23864ab..17d37c0 100644
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -944,6 +944,18 @@ static int spapr_device_hotplug_add(DeviceState *qdev, PCIDevice *dev)
     drc_entry_slot->state &= ~(uint32_t)INDICATOR_ENTITY_SENSE_MASK;
     drc_entry_slot->state |= encoded; /* and the slot */
 
+    /* reliable unplug requires we wait for a transition from
+     * UNISOLATED->ISOLATED prior to device removal/deletion.
+     * However, slots populated by devices at boot-time will not
+     * have ever been set by guest tools to an UNISOLATED/populated
+     * state, so set this manually in the case of coldplug devices
+     */
+    if (!DEVICE(dev)->hotplugged) {
+        drc_entry_slot->state |= ENCODE_DRC_STATE(1,
+                                                  INDICATOR_ISOLATION_MASK,
+                                                  INDICATOR_ISOLATION_SHIFT);
+    }
+
     /* add OF node for pci device and required OF DT properties */
     fdt_orig = g_malloc0(FDT_MAX_SIZE);
     offset = fdt_create(fdt_orig, FDT_MAX_SIZE);
@@ -1026,13 +1038,21 @@ static void spapr_device_hotplug_remove(DeviceState *qdev, PCIDevice *dev)
 static void spapr_phb_hot_plug(HotplugHandler *plug_handler,
                                DeviceState *plugged_dev, Error **errp)
 {
+    int slot = PCI_SLOT(PCI_DEVICE(plugged_dev)->devfn);
+
     spapr_device_hotplug_add(DEVICE(plug_handler), PCI_DEVICE(plugged_dev));
+    if (plugged_dev->hotplugged) {
+        spapr_pci_hotplug_add_event(DEVICE(plug_handler), slot);
+    }
 }
 
 static void spapr_phb_hot_unplug(HotplugHandler *plug_handler,
                                  DeviceState *plugged_dev, Error **errp)
 {
+    int slot = PCI_SLOT(PCI_DEVICE(plugged_dev)->devfn);
+
     spapr_device_hotplug_remove(DEVICE(plug_handler), PCI_DEVICE(plugged_dev));
+    spapr_pci_hotplug_remove_event(DEVICE(plug_handler), slot);
 }
 
 static void spapr_phb_realize(DeviceState *dev, Error **errp)
-- 
1.9.1