configure: Work-around a bug in libiscsi 1.9.0 when used in gnu99 mode
PATCH v3 1/1 configure: Work-around a bug in libiscsi 1.9.0 when used in gnu99 mode
The header "scsi-lowlevel.h" of libiscsi 1.9.0 contains some bad "inline" prototype definitions which GCC refuses to compile in its gnu99 mode:
In file included from block/iscsi.c:52:0:/usr/include/iscsi/scsi-lowlevel.h:810:13: error: inline function ‘scsi_set_uint16’ declared but never defined [-Werror]
inline void scsi_set_uint16(unsigned char *c, uint16_t val);
^
/usr/include/iscsi/scsi-lowlevel.h:809:13: error: inline function
‘scsi_set_uint32’ declared but never defined [-Werror]
inline void scsi_set_uint32(unsigned char *c, uint32_t val);
^[...]
This has been fixed by upstream libiscsi in version 1.10.0 (see
https://github.com/sahlberg/libiscsi/commit/7692027d6c11 ), but since we still want to support 1.9.0 for CentOS 7 / RHEL7, we have to work-around the issue by redefining the "inline" keyword to use the old "gnu89" mode behavior via "gnu_inline" instead.
--- block/iscsi.c | 2 ++ 1 file changed, 2 insertions(+)
block/iscsi.c +2 -0
@@ -49,7 +49,9 @@/* Conflict between scsi/utils.h and libiscsi! :( */ #define SCSI_XFER_NONE ISCSI_XFER_NONE#include <iscsi/iscsi.h> +#define inline __attribute__((gnu_inline))/* required for libiscsi v1.9.0 */ #include <iscsi/scsi-lowlevel.h> +#undef inline#undef SCSI_XFER_NONEQEMU_BUILD_BUG_ON ((int )SCSI_XFER_NONE != (int )ISCSI_XFER_NONE );
Signature · 1 line
1.8.3.1
Quoted 31 lines · Thomas Huth
The header "
scsi-lowlevel.h" of libiscsi 1.9.0 contains some bad "inline" prototype definitions which GCC refuses to compile in its gnu99 mode:In file included from
block/iscsi.c:52:0:/usr/include/iscsi/scsi-lowlevel.h:810:13: error: inline function ‘scsi_set_uint16’ declared but never defined [-Werror]inline void scsi_set_uint16(unsigned char *c, uint16_t val); ^ /usr/include/iscsi/scsi-lowlevel.h:809:13: error: inline function ‘scsi_set_uint32’ declared but never defined [-Werror] inline void scsi_set_uint32(unsigned char *c, uint32_t val); ^[...]
This has been fixed by upstream libiscsi in version 1.10.0 (see
https://github.com/sahlberg/libiscsi/commit/7692027d6c11 ), but since we still want to support 1.9.0 for CentOS 7 / RHEL7, we have to work-around the issue by redefining the "inline" keyword to use the old "gnu89" mode behavior via "gnu_inline" instead.Signed-off-by Thomas Huth <[email protected]>--- block/iscsi.c | 2 ++ 1 file changed, 2 insertions(+)block/iscsi.c +0
-0
block/iscsi.c line 56
Quoted 8 lines
block/iscsi.c +2
-0@@ -49,7 +49,9 @@/* Conflict between scsi/utils.h and libiscsi! :( */ #define SCSI_XFER_NONE ISCSI_XFER_NONE#include <iscsi/iscsi.h> +#define inline __attribute__((gnu_inline))/* required for libiscsi v1.9.0 */ #include <iscsi/scsi-lowlevel.h> +#undef inline#undef SCSI_XFER_NONEQEMU_BUILD_BUG_ON ((int )SCSI_XFER_NONE != (int )ISCSI_XFER_NONE );
Signature · 3 lines
Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3226 Virtualization: qemu.org | libvirt.org