mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
pci: rename virPCIDeviceGetVFIOGroupDev to virPCIDeviceGetIOMMUGroupDev
I realized after the fact that it's probably better in the long run to give this function a name that matches the name of the link used in sysfs to hold the group (iommu_group). I'm changing it now because I'm about to add several more functions that deal with iommu groups.
This commit is contained in:
parent
ee1d1f3b54
commit
1d829e1306
@ -1698,6 +1698,7 @@ virPCIDeviceCopy;
|
||||
virPCIDeviceDetach;
|
||||
virPCIDeviceFileIterate;
|
||||
virPCIDeviceFree;
|
||||
virPCIDeviceGetIOMMUGroupDev;
|
||||
virPCIDeviceGetManaged;
|
||||
virPCIDeviceGetName;
|
||||
virPCIDeviceGetRemoveSlot;
|
||||
@ -1705,7 +1706,6 @@ virPCIDeviceGetReprobe;
|
||||
virPCIDeviceGetStubDriver;
|
||||
virPCIDeviceGetUnbindFromStub;
|
||||
virPCIDeviceGetUsedBy;
|
||||
virPCIDeviceGetVFIOGroupDev;
|
||||
virPCIDeviceIsAssignable;
|
||||
virPCIDeviceListAdd;
|
||||
virPCIDeviceListCount;
|
||||
|
@ -277,7 +277,7 @@ qemuSetupHostdevCGroup(virDomainObjPtr vm,
|
||||
if (!pci)
|
||||
goto cleanup;
|
||||
|
||||
if (!(path = virPCIDeviceGetVFIOGroupDev(pci)))
|
||||
if (!(path = virPCIDeviceGetIOMMUGroupDev(pci)))
|
||||
goto cleanup;
|
||||
|
||||
VIR_DEBUG("Cgroup allow %s for PCI device assignment", path);
|
||||
@ -376,7 +376,7 @@ qemuTeardownHostdevCgroup(virDomainObjPtr vm,
|
||||
if (!pci)
|
||||
goto cleanup;
|
||||
|
||||
if (!(path = virPCIDeviceGetVFIOGroupDev(pci)))
|
||||
if (!(path = virPCIDeviceGetIOMMUGroupDev(pci)))
|
||||
goto cleanup;
|
||||
|
||||
VIR_DEBUG("Cgroup deny %s for PCI device assignment", path);
|
||||
|
@ -823,7 +823,7 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr,
|
||||
|
||||
if (dev->source.subsys.u.pci.backend
|
||||
== VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
|
||||
char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci);
|
||||
char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
|
||||
|
||||
if (!vfioGroupDev) {
|
||||
virPCIDeviceFree(pci);
|
||||
|
@ -529,7 +529,7 @@ virSecurityDACSetSecurityHostdevLabel(virSecurityManagerPtr mgr,
|
||||
|
||||
if (dev->source.subsys.u.pci.backend
|
||||
== VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
|
||||
char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci);
|
||||
char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
|
||||
|
||||
if (!vfioGroupDev) {
|
||||
virPCIDeviceFree(pci);
|
||||
@ -648,7 +648,7 @@ virSecurityDACRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr,
|
||||
|
||||
if (dev->source.subsys.u.pci.backend
|
||||
== VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
|
||||
char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci);
|
||||
char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
|
||||
|
||||
if (!vfioGroupDev) {
|
||||
virPCIDeviceFree(pci);
|
||||
|
@ -1333,7 +1333,7 @@ virSecuritySELinuxSetSecurityHostdevSubsysLabel(virDomainDefPtr def,
|
||||
|
||||
if (dev->source.subsys.u.pci.backend
|
||||
== VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
|
||||
char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci);
|
||||
char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
|
||||
|
||||
if (!vfioGroupDev) {
|
||||
virPCIDeviceFree(pci);
|
||||
@ -1528,7 +1528,7 @@ virSecuritySELinuxRestoreSecurityHostdevSubsysLabel(virSecurityManagerPtr mgr,
|
||||
|
||||
if (dev->source.subsys.u.pci.backend
|
||||
== VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO) {
|
||||
char *vfioGroupDev = virPCIDeviceGetVFIOGroupDev(pci);
|
||||
char *vfioGroupDev = virPCIDeviceGetIOMMUGroupDev(pci);
|
||||
|
||||
if (!vfioGroupDev) {
|
||||
virPCIDeviceFree(pci);
|
||||
|
@ -1852,11 +1852,11 @@ cleanup:
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* virPCIDeviceGetVFIOGroupDev - return the name of the device used to
|
||||
* control this PCI device's group (e.g. "/dev/vfio/15")
|
||||
/* virPCIDeviceGetIOMMUGroupDev - return the name of the device used
|
||||
* to control this PCI device's group (e.g. "/dev/vfio/15")
|
||||
*/
|
||||
char *
|
||||
virPCIDeviceGetVFIOGroupDev(virPCIDevicePtr dev)
|
||||
virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev)
|
||||
{
|
||||
char *devPath = NULL;
|
||||
char *groupPath = NULL;
|
||||
|
@ -117,7 +117,7 @@ int virPCIDeviceFileIterate(virPCIDevicePtr dev,
|
||||
virPCIDeviceFileActor actor,
|
||||
void *opaque);
|
||||
char *
|
||||
virPCIDeviceGetVFIOGroupDev(virPCIDevicePtr dev);
|
||||
virPCIDeviceGetIOMMUGroupDev(virPCIDevicePtr dev);
|
||||
|
||||
int virPCIDeviceIsAssignable(virPCIDevicePtr dev,
|
||||
int strict_acs_check);
|
||||
|
Loading…
Reference in New Issue
Block a user