提交 58662f44 编写于 作者: G Guido Günther

Make detect_scsi_host_caps a function on all architectures

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.
上级 b562d7b7
......@@ -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,
......
......@@ -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__ */
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册