External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-08 05:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make detect_scsi_host_caps a function on all architectures

Browse Source 
In the non linux case some callers like gather_scsi_host_caps needed the
return code of -1 while others like update_caps needed an empty
statement (to avoid a "statement without effect" warning). This is much
simpler solved by using a function instead of a define.
(cherry picked from commit 58662f4416)
This commit is contained in:
Guido Günther 2013-05-03 08:03:26 +02:00 committed by Eric Blake
parent 4a4d2300ff
commit 3b8f6e5fd6
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/node_device/node_device_driver.h
View File

@ -51,16 +51,7 @@ void nodeDeviceUnlock(virNodeDeviceDriverStatePtr driver);
int nodedevRegister(void);
# ifdef __linux__
# define detect_scsi_host_caps(d) detect_scsi_host_caps_linux(d)
int detect_scsi_host_caps_linux(union _virNodeDevCapData *d);
# else /* __linux__ */
# define detect_scsi_host_caps(d) (-1)
# endif /* __linux__ */
int detect_scsi_host_caps(union _virNodeDevCapData *d);
int nodeNumOfDevices(virConnectPtr conn, const char *cap, unsigned int flags);
int nodeListDevices(virConnectPtr conn, const char *cap, char **const names,

10
src/node_device/node_device_linux_sysfs.c
View File

@ -38,7 +38,7 @@
#ifdef __linux__
int
detect_scsi_host_caps_linux(union _virNodeDevCapData *d)
detect_scsi_host_caps(union _virNodeDevCapData *d)
{
char *max_vports = NULL;
char *vports = NULL;
@ -127,4 +127,12 @@ cleanup:
return ret;
}
#else
int
detect_scsi_host_caps(union _virNodeDevCapData *d ATTRIBUTE_UNUSED)
{
return -1;
}
#endif /* __linux__ */