External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

conf: Move virDomainPCIAddressAsString() to util/virpci

Browse Source 
It's a better fit than conf/domain_conf.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Andrea Bolognani 2018-09-04 18:32:38 +02:00
parent e9e904b3b7
commit b72183223f
5 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/conf/domain_addr.c
View File

@ -573,20 +573,6 @@ virDomainPCIAddressSetGrow(virDomainPCIAddressSetPtr addrs,
} }
char *
virDomainPCIAddressAsString(virPCIDeviceAddressPtr addr)
{
char *str;
ignore_value(virAsprintf(&str, "%.4x:%.2x:%.2x.%.1x",
addr->domain,
addr->bus,
addr->slot,
addr->function));
return str;
}
/* /*
* Check if the PCI slot is used by another device. * Check if the PCI slot is used by another device.
*/ */

3
src/conf/domain_addr.h
View File

@ -124,9 +124,6 @@ struct _virDomainPCIAddressSet {
typedef struct _virDomainPCIAddressSet virDomainPCIAddressSet; typedef struct _virDomainPCIAddressSet virDomainPCIAddressSet;
typedef virDomainPCIAddressSet *virDomainPCIAddressSetPtr; typedef virDomainPCIAddressSet *virDomainPCIAddressSetPtr;
char *virDomainPCIAddressAsString(virPCIDeviceAddressPtr addr)
ATTRIBUTE_NONNULL(1);
virDomainPCIAddressSetPtr virDomainPCIAddressSetAlloc(unsigned int nbuses); virDomainPCIAddressSetPtr virDomainPCIAddressSetAlloc(unsigned int nbuses);
void virDomainPCIAddressSetFree(virDomainPCIAddressSetPtr addrs); void virDomainPCIAddressSetFree(virDomainPCIAddressSetPtr addrs);

2
src/libvirt_private.syms
View File

@ -119,7 +119,6 @@ virPCIDeviceAddressParseXML;
virDomainCCWAddressAssign; virDomainCCWAddressAssign;
virDomainCCWAddressSetCreateFromDomain; virDomainCCWAddressSetCreateFromDomain;
virDomainCCWAddressSetFree; virDomainCCWAddressSetFree;
virDomainPCIAddressAsString;
virDomainPCIAddressBusIsFullyReserved; virDomainPCIAddressBusIsFullyReserved;
virDomainPCIAddressBusSetModel; virDomainPCIAddressBusSetModel;
virDomainPCIAddressEnsureAddr; virDomainPCIAddressEnsureAddr;
@ -2497,6 +2496,7 @@ virObjectUnref;
# util/virpci.h # util/virpci.h
virDomainPCIAddressAsString;
virPCIDeviceAddressGetIOMMUGroupAddresses; virPCIDeviceAddressGetIOMMUGroupAddresses;
virPCIDeviceAddressGetIOMMUGroupNum; virPCIDeviceAddressGetIOMMUGroupNum;
virPCIDeviceAddressGetSysfsFile; virPCIDeviceAddressGetSysfsFile;

13
src/util/virpci.c
View File

@ -1684,6 +1684,19 @@ virPCIGetAddrString(unsigned int domain,
return 0; return 0;
} }
char *
virDomainPCIAddressAsString(virPCIDeviceAddressPtr addr)
{
char *str;
ignore_value(virAsprintf(&str, "%.4x:%.2x:%.2x.%.1x",
addr->domain,
addr->bus,
addr->slot,
addr->function));
return str;
}
virPCIDevicePtr virPCIDevicePtr
virPCIDeviceNew(unsigned int domain, virPCIDeviceNew(unsigned int domain,
unsigned int bus, unsigned int bus,

3
src/util/virpci.h
View File

@ -225,6 +225,9 @@ int virPCIGetAddrString(unsigned int domain,
char **pciConfigAddr) char **pciConfigAddr)
ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK;
char *virDomainPCIAddressAsString(virPCIDeviceAddressPtr addr)
ATTRIBUTE_NONNULL(1);
int virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf); int virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf);
int virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, int virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path,