[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [patch v5 07/12] pci: add a pci_function_is_valid callb
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-devel] [patch v5 07/12] pci: add a pci_function_is_valid callback to check function if valid |
Date: |
Sun, 27 Mar 2016 15:52:27 +0300 |
On Wed, Mar 23, 2016 at 06:12:02PM +0800, Cao jin wrote:
> 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>
So I sent some comments, but I do not want to hold up this series.
If there's a respin anyway, pls try to address my comments.
Alex, if you want to merge this in this shape, you can include my
Reviewed-by: Michael S. Tsirkin <address@hidden>
for now, and we can clean up the issues afterwards.
> ---
> 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 e67664d..2a5291a 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -1840,6 +1840,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;
> @@ -1882,6 +1898,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 0be07c8..4a2f7d4 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -190,6 +190,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.9.3
>
>
- [Qemu-devel] [patch v5 00/12] vfio-pci: pass the aer error to guest, part2, Cao jin, 2016/03/23
- [Qemu-devel] [patch v5 03/12] vfio: add pcie extended capability support, Cao jin, 2016/03/23
- [Qemu-devel] [patch v5 06/12] vfio: add check host bus reset is support or not, Cao jin, 2016/03/23
- [Qemu-devel] [patch v5 05/12] vfio: refine function vfio_pci_host_match, Cao jin, 2016/03/23
- [Qemu-devel] [patch v5 08/12] vfio: add check aer functionality for hotplug device, Cao jin, 2016/03/23
- [Qemu-devel] [patch v5 10/12] vfio-pci: pass the aer error to guest, Cao jin, 2016/03/23
- [Qemu-devel] [patch v5 09/12] vfio: vote the function 0 to do host bus reset when aer occurred, Cao jin, 2016/03/23
- [Qemu-devel] [patch v5 11/12] vfio: device may stuck in D3 when doing aer recovery, Cao jin, 2016/03/23