From 31a4a679b3ce830e8935801f62bce92371ceee95 Mon Sep 17 00:00:00 2001 From: Laine Stump Date: Mon, 17 Jun 2013 11:57:19 -0400 Subject: [PATCH] pci: rename virPCIParseDeviceAddress and make it public This function has utility outside of virpci.c, so make it public. Also the name didn't fit convention, so change it to virPCIDeviceAddressParse. --- src/libvirt_private.syms | 1 + src/util/virpci.c | 6 +++--- src/util/virpci.h | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index bad3947445..4c5f5a33e5 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1694,6 +1694,7 @@ virObjectUnref; # util/virpci.h virPCIDeviceAddressGetSysfsFile; +virPCIDeviceAddressParse; virPCIDeviceCopy; virPCIDeviceDetach; virPCIDeviceFileIterate; diff --git a/src/util/virpci.c b/src/util/virpci.c index 51fad784fd..92f27d93c6 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2046,8 +2046,8 @@ logStrToLong_ui(char const *s, return ret; } -static int -virPCIParseDeviceAddress(char *address, +int +virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf) { char *p = NULL; @@ -2111,7 +2111,7 @@ virPCIGetDeviceAddressFromSysfsLink(const char *device_link, goto out; } - if (virPCIParseDeviceAddress(config_address, *bdf) != 0) { + if (virPCIDeviceAddressParse(config_address, *bdf) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to parse PCI config address '%s'"), config_address); diff --git a/src/util/virpci.h b/src/util/virpci.h index 89717b828d..fe474e2c48 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -152,6 +152,8 @@ int virPCIGetAddrString(unsigned int domain, char **pciConfigAddr) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; +int virPCIDeviceAddressParse(char *address, virPCIDeviceAddressPtr bdf); + int virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path, char **pfname, int *vf_index);