From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJXCq-0000oo-KQ for qemu-devel@nongnu.org; Mon, 18 Aug 2014 20:23:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XJXCd-0004Ke-Db for qemu-devel@nongnu.org; Mon, 18 Aug 2014 20:23:20 -0400 Received: from e9.ny.us.ibm.com ([32.97.182.139]:33265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XJXCd-0004KN-9f for qemu-devel@nongnu.org; Mon, 18 Aug 2014 20:23:07 -0400 Received: from /spool/local by e9.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 18 Aug 2014 20:23:06 -0400 From: Michael Roth Date: Mon, 18 Aug 2014 19:21:58 -0500 Message-Id: <1408407718-10835-13-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1408407718-10835-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1408407718-10835-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 12/12] spapr_pci: emit hotplug add/remove events during hotplug List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aik@ozlabs.ru, agraf@suse.de, ncmike@ncultra.org, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com From: Tyrel Datwyler 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 Signed-off-by: Michael Roth --- 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