[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 06/11] pci: add a pci_function_is_valid callback
From: |
Zhou Jie |
Subject: |
[Qemu-devel] [PATCH v9 06/11] pci: add a pci_function_is_valid callback to check function if valid |
Date: |
Tue, 19 Jul 2016 15:38:24 +0800 |
From: Chen Fan <address@hidden>
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 <address@hidden>
---
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 149994b..b292b42 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1940,6 +1940,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;
@@ -1982,6 +1998,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 9ed1624..68b6848 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -198,6 +198,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
- [Qemu-devel] [PATCH v9 00/11] vfio-pci: pass the aer error to guest, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 02/11] vfio: squeeze out vfio_pci_do_hot_reset for support bus reset, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 01/11] vfio: extract vfio_get_hot_reset_info as a single function, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 03/11] vfio: add aer support for vfio device, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 05/11] vfio: add check host bus reset is support or not, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 04/11] vfio: refine function vfio_pci_host_match, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 06/11] pci: add a pci_function_is_valid callback to check function if valid,
Zhou Jie <=
- [Qemu-devel] [PATCH v9 07/11] vfio: add check aer functionality for hotplug device, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 08/11] vfio: vote the function 0 to do host bus reset when aer occurred, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 09/11] vfio-pci: pass the aer error to guest, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 11/11] vfio: add 'aer' property to expose aercap, Zhou Jie, 2016/07/19
- [Qemu-devel] [PATCH v9 10/11] vfio: Add waiting for host aer error progress, Zhou Jie, 2016/07/19