From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2sEf-0002rA-4P for qemu-devel@nongnu.org; Tue, 17 May 2016 23:33:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2sEd-0004Z4-4F for qemu-devel@nongnu.org; Tue, 17 May 2016 23:33:24 -0400 Received: from [59.151.112.132] (port=18964 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2sEc-0004XF-Lg for qemu-devel@nongnu.org; Tue, 17 May 2016 23:33:23 -0400 From: Zhou Jie Date: Wed, 18 May 2016 11:31:05 +0800 Message-ID: <1463542270-3409-8-git-send-email-zhoujie2011@cn.fujitsu.com> In-Reply-To: <1463542270-3409-1-git-send-email-zhoujie2011@cn.fujitsu.com> References: <1463542270-3409-1-git-send-email-zhoujie2011@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 07/12] pci: add a pci_function_is_valid callback to check function if valid List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, alex.williamson@redhat.com Cc: izumi.taku@jp.fujitsu.com, mst@redhat.com, caoj.fnst@cn.fujitsu.com, Chen Fan From: Chen Fan PCI hotplug requires that function 0 is added last to close the slot. Since vfio supporting AER, we require that the VM bus contains the same set of devices as the host bus to support AER, we can perform an AER validation test whenever a function 0 in the VM is hot-added. Signed-off-by: Chen Fan --- hw/pci/pci.c | 32 ++++++++++++++++++++++++++++++++ include/hw/pci/pci.h | 1 + 2 files changed, 33 insertions(+) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index bb605ef..acd48eb 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1841,6 +1841,22 @@ PCIDevice *pci_find_device(PCIBus *bus, int bus_num, uint8_t devfn) return bus->devices[devfn]; } +static void pci_function_is_valid(PCIBus *bus, PCIDevice *d, void *opaque) +{ + PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(d); + Error **errp = opaque; + + if (*errp) { + return; + } + + if (!pc->is_valid_func) { + return; + } + + pc->is_valid_func(d, errp); +} + static void pci_qdev_realize(DeviceState *qdev, Error **errp) { PCIDevice *pci_dev = (PCIDevice *)qdev; @@ -1883,6 +1899,22 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) pci_qdev_unrealize(DEVICE(pci_dev), NULL); return; } + + /* + * If the function number is 0, indicate the closure of the slot. + * then we get the chance to check all functions on same device + * if valid. + */ + if (DEVICE(pci_dev)->hotplugged && + pci_get_function_0(pci_dev) == pci_dev) { + pci_for_each_device(bus, pci_bus_num(bus), + pci_function_is_valid, &local_err); + if (local_err) { + error_propagate(errp, local_err); + pci_qdev_unrealize(DEVICE(pci_dev), NULL); + return; + } + } } static void pci_default_realize(PCIDevice *dev, Error **errp) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index ef6ba51..848fa7b 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -197,6 +197,7 @@ typedef struct PCIDeviceClass { void (*realize)(PCIDevice *dev, Error **errp); int (*init)(PCIDevice *dev);/* TODO convert to realize() and remove */ + void (*is_valid_func)(PCIDevice *dev, Error **errp); PCIUnregisterFunc *exit; PCIConfigReadFunc *config_read; PCIConfigWriteFunc *config_write; -- 1.8.3.1