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 emtpy
statement (to avoid a "statement without effect" warning). This is much
simpler solved by using a function instead of a define.
---
src/node_device/node_device_driver.h | 11 +----------
src/node_device/node_device_linux_sysfs.c | 10 +++++++++-
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index b6c6f18..9e97b7d 100644
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -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,
diff --git a/src/node_device/node_device_linux_sysfs.c
b/src/node_device/node_device_linux_sysfs.c
index 71c7172..5228a01 100644
--- a/src/node_device/node_device_linux_sysfs.c
+++ b/src/node_device/node_device_linux_sysfs.c
@@ -39,7 +39,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;
@@ -128,4 +128,12 @@ cleanup:
return ret;
}
+#else
+
+int
+detect_scsi_host_caps(union _virNodeDevCapData *d ATTRIBUTE_UNUSED)
+{
+ return -1;
+}
+
#endif /* __linux__ */
--
1.7.10.4