shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-27 18:03:50 +03:00
Code Releases Activity

util: use size_t instead of unsigned int for num_virtual_functions

Browse Source 
This is a prerequisite to the fix for the fix to:

  https://bugzilla.redhat.com/show_bug.cgi?id=1025397

num_virtual_functions needs to be size_t in order to use the
VIR_APPEND_ELEMENT macro.
This commit is contained in:
Laine Stump 2013-11-08 12:39:08 +02:00
parent 54e4d9d081
commit 89e2a6c88c
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/node_device_conf.h
View File

@ -110,7 +110,7 @@ struct _virNodeDevCapsDef {
char *vendor_name;
virPCIDeviceAddressPtr physical_function;
virPCIDeviceAddressPtr *virtual_functions;
unsigned int num_virtual_functions;
size_t num_virtual_functions;
unsigned int flags;
virPCIDeviceAddressPtr *iommuGroupDevices;
size_t nIommuGroupDevices;

2
src/network/bridge_driver.c
View File

@ -3046,7 +3046,7 @@ int networkRegister(void) {
*/
static int
networkCreateInterfacePool(virNetworkDefPtr netdef) {
unsigned int num_virt_fns = 0;
size_t num_virt_fns = 0;
char **vfname = NULL;
virPCIDeviceAddressPtr *virt_fns;
int ret = -1;

4
src/util/virnetdev.c
View File

@ -1104,7 +1104,7 @@ int
virNetDevGetVirtualFunctions(const char *pfname,
char ***vfname,
virPCIDeviceAddressPtr **virt_fns,
unsigned int *n_vfname)
size_t *n_vfname)
{
int ret = -1;
size_t i;
@ -1291,7 +1291,7 @@ int
virNetDevGetVirtualFunctions(const char *pfname ATTRIBUTE_UNUSED,
char ***vfname ATTRIBUTE_UNUSED,
virPCIDeviceAddressPtr **virt_fns ATTRIBUTE_UNUSED,
unsigned int *n_vfname ATTRIBUTE_UNUSED)
size_t *n_vfname ATTRIBUTE_UNUSED)
{
virReportSystemError(ENOSYS, "%s",
_("Unable to get virtual functions on this platform"));

2
src/util/virnetdev.h
View File

@ -124,7 +124,7 @@ int virNetDevGetPhysicalFunction(const char *ifname, char **pfname)
int virNetDevGetVirtualFunctions(const char *pfname,
char ***vfname,
virPCIDeviceAddressPtr **virt_fns,
unsigned int *n_vfname)
size_t *n_vfname)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK;

8
src/util/virpci.c
View File

@ -2385,7 +2385,7 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path,
int
virPCIGetVirtualFunctions(const char *sysfs_path,
virPCIDeviceAddressPtr **virtual_functions,
unsigned int *num_virtual_functions)
size_t *num_virtual_functions)
{
int ret = -1;
size_t i;
@ -2418,7 +2418,7 @@ virPCIGetVirtualFunctions(const char *sysfs_path,
goto error;
}
VIR_DEBUG("Number of virtual functions: %d",
VIR_DEBUG("Number of virtual functions: %zu",
*num_virtual_functions);
if (virPCIGetDeviceAddressFromSysfsLink(device_link,
@ -2489,7 +2489,7 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link,
{
int ret = -1;
size_t i;
unsigned int num_virt_fns = 0;
size_t num_virt_fns = 0;
virPCIDeviceAddressPtr vf_bdf = NULL;
virPCIDeviceAddressPtr *virt_fns = NULL;
@ -2634,7 +2634,7 @@ virPCIGetPhysicalFunction(const char *vf_sysfs_path ATTRIBUTE_UNUSED,
int
virPCIGetVirtualFunctions(const char *sysfs_path ATTRIBUTE_UNUSED,
virPCIDeviceAddressPtr **virtual_functions ATTRIBUTE_UNUSED,
unsigned int *num_virtual_functions ATTRIBUTE_UNUSED)
size_t *num_virtual_functions ATTRIBUTE_UNUSED)
{
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported));
return -1;

2
src/util/virpci.h
View File

@ -138,7 +138,7 @@ int virPCIGetPhysicalFunction(const char *sysfs_path,
int virPCIGetVirtualFunctions(const char *sysfs_path,
virPCIDeviceAddressPtr **virtual_functions,
unsigned int *num_virtual_functions);
size_t *num_virtual_functions);
int virPCIIsVirtualFunction(const char *vf_sysfs_device_link);