[libvirt] [PATCH 2/2] 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 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
On 05/03/2013 12:22 AM, Guido Günther wrote:
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
s/emtpy/empty/
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(-)
ACK.
+int +detect_scsi_host_caps(union _virNodeDevCapData *d ATTRIBUTE_UNUSED)
It would eventually be nice to rename this virDetectScsiHostCaps, but that can be a cleanup for another day; your patch is fine for the build-breaker on FreeBSD that Roman reported. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Fri, May 03, 2013 at 06:04:11AM -0600, Eric Blake wrote:
On 05/03/2013 12:22 AM, Guido Günther wrote:
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
s/emtpy/empty/
Both pushed with the above fixed. -- Guido
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(-)
ACK.
+int +detect_scsi_host_caps(union _virNodeDevCapData *d ATTRIBUTE_UNUSED)
It would eventually be nice to rename this virDetectScsiHostCaps, but that can be a cleanup for another day; your patch is fine for the build-breaker on FreeBSD that Roman reported.
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Fri, May 03, 2013 at 06:04:11AM -0600, Eric Blake wrote:
On 05/03/2013 12:22 AM, Guido Günther wrote:
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
s/emtpy/empty/
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(-)
ACK.
With these we have the kFreeBSD builds back: https://buildd.debian.org/status/package.php?p=libvirt&suite=experimental Thanks a lot! Unfortunately I failed to add a kFreeBSD Jenkins yet since we dont have OpenJDK and gcj doesn't seem to be up to the job: http://lists.debian.org/debian-java/2013/05/msg00006.html But doing it over ssh will do for now: http://honk.sigxcpu.org:8001/job/libvirt-build-debian-jessie-kfreebsd64/ Cheers, -- Guido
+int +detect_scsi_host_caps(union _virNodeDevCapData *d ATTRIBUTE_UNUSED)
It would eventually be nice to rename this virDetectScsiHostCaps, but that can be a cleanup for another day; your patch is fine for the build-breaker on FreeBSD that Roman reported.
-- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
-- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
participants (2)
-
Eric Blake -
Guido Günther