External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: node_device: refactor GetPCIMdevTypesCaps into GetMdevTypeCapes

Browse Source 
Extracting PCI from virNodeDeviceGetPCIMdevTypesCaps creating
virNodeDeviceGetMdevTypesCaps to make later reuse possible.

Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Boris Fiuczynski 2020-10-23 19:31:46 +02:00 committed by Ján Tomko
parent da5cf518ad
commit f1b08901f7
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/conf/node_device_conf.c
View File

@ -2584,26 +2584,25 @@ virNodeDeviceGetPCIIOMMUGroupCaps(virNodeDevCapPCIDevPtr pci_dev)
static int static int
virNodeDeviceGetPCIMdevTypesCaps(const char *sysfspath, virNodeDeviceGetMdevTypesCaps(const char *sysfspath,
virNodeDevCapPCIDevPtr pci_dev) virMediatedDeviceTypePtr **mdev_types,
size_t *nmdev_types)
{ {
virMediatedDeviceTypePtr *types = NULL; virMediatedDeviceTypePtr *types = NULL;
size_t ntypes = 0; size_t ntypes = 0;
size_t i; size_t i;
/* this could be a refresh, so clear out the old data */ /* this could be a refresh, so clear out the old data */
for (i = 0; i < pci_dev->nmdev_types; i++) for (i = 0; i < *nmdev_types; i++)
virMediatedDeviceTypeFree(pci_dev->mdev_types[i]); virMediatedDeviceTypeFree(*mdev_types[i]);
VIR_FREE(pci_dev->mdev_types); VIR_FREE(*mdev_types);
pci_dev->nmdev_types = 0; *nmdev_types = 0;
pci_dev->flags &= ~VIR_NODE_DEV_CAP_FLAG_PCI_MDEV;
if (virMediatedDeviceGetMdevTypes(sysfspath, &types, &ntypes) < 0) if (virMediatedDeviceGetMdevTypes(sysfspath, &types, &ntypes) < 0)
return -1; return -1;
pci_dev->mdev_types = g_steal_pointer(&types); *mdev_types = g_steal_pointer(&types);
pci_dev->nmdev_types = ntypes; *nmdev_types = ntypes;
pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_MDEV;
return 0; return 0;
} }
@ -2620,9 +2619,17 @@ virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath,
virNodeDevCapPCIDevPtr pci_dev) virNodeDevCapPCIDevPtr pci_dev)
{ {
if (virNodeDeviceGetPCISRIOVCaps(sysfsPath, pci_dev) < 0 || if (virNodeDeviceGetPCISRIOVCaps(sysfsPath, pci_dev) < 0 ||
virNodeDeviceGetPCIIOMMUGroupCaps(pci_dev) < 0 || virNodeDeviceGetPCIIOMMUGroupCaps(pci_dev) < 0)
virNodeDeviceGetPCIMdevTypesCaps(sysfsPath, pci_dev) < 0)
return -1; return -1;
pci_dev->flags &= ~VIR_NODE_DEV_CAP_FLAG_PCI_MDEV;
if (virNodeDeviceGetMdevTypesCaps(sysfsPath,
&pci_dev->mdev_types,
&pci_dev->nmdev_types) < 0)
return -1;
if (pci_dev->nmdev_types > 0)
pci_dev->flags |= VIR_NODE_DEV_CAP_FLAG_PCI_MDEV;
return 0; return 0;
} }