[libvirt] [PATCH 15/15] conf: nodedev: Update PCI mdev capabilities dynamically

Just like SRIOV, a PCI device is only capable of the mediated devices framework when it's bound to the vendor native driver, thus if a driver change occurs, e.g. vendor_native->vfio, we need to refresh some of the device's capabilities to reflect the reality, mdev included. Signed-off-by: Erik Skultety <eskultet(a)redhat.com&gt; Suggested-by: Wu Zongyong <cordius.wu(a)huawei.com&gt; --- src/conf/node_device_conf.c | 34 +++++++++++++++++++++++++++++++--- src/node_device/node_device_udev.c | 1 - 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 5fc5f6708..9e4273855 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2758,6 +2758,34 @@ virNodeDeviceGetPCIIOMMUGroupCaps(virNodeDevCapPCIDevPtr pci_dev) } +static int +virNodeDeviceGetPCIMdevTypesCaps(const char *sysfspath, + virNodeDevCapPCIDevPtr pci_dev) +{ + virMediatedDeviceTypePtr *types = NULL; + int rc = 0; + size_t i; + + /* this could be a refresh, so clear out the old data */ + for (i = 0; i < pci_dev->nmdev_types; i++) + virMediatedDeviceTypeFree(pci_dev->mdev_types[i]); + VIR_FREE(pci_dev->mdev_types); + pci_dev->nmdev_types = 0; + pci_dev->flags &= ~VIR_NODE_DEV_CAP_FLAG_PCI_MDEV; + + rc = virPCIGetMdevTypes(sysfspath, &types); + + if (rc <= 0) + return rc; + + VIR_STEAL_PTR(pci_dev->mdev_types, types); + pci_dev->nmdev_types = rc; + pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_MDEV; + + return 0; +} + + /* virNodeDeviceGetPCIDynamicCaps() get info that is stored in sysfs * about devices related to this device, i.e. things that can change * without this device itself changing. These must be refreshed @@ -2768,9 +2796,9 @@ int virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath, virNodeDevCapPCIDevPtr pci_dev) { - if (virNodeDeviceGetPCISRIOVCaps(sysfsPath, pci_dev) < 0) - return -1; - if (virNodeDeviceGetPCIIOMMUGroupCaps(pci_dev) < 0) + if (virNodeDeviceGetPCISRIOVCaps(sysfsPath, pci_dev) < 0 || + virNodeDeviceGetPCIIOMMUGroupCaps(pci_dev) < 0 || + virNodeDeviceGetPCIMdevTypesCaps(sysfsPath, pci_dev) < 0) return -1; return 0; } diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index 1ccf1f8b4..e10660ba0 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -484,7 +484,6 @@ udevProcessPCI(struct udev_device *device, } ret = 0; - cleanup: virPCIDeviceFree(pciDev); virPCIEDeviceInfoFree(pci_express); -- 2.13.6