block/iscsi: Restrict Linux-specific code
PATCH 1/1 block/iscsi: Restrict Linux-specific code
Some Linux specific code is missing guards, leading to build failure on OSX:
$ sudo brew install libiscsi
$ ./configure && make
[...]
CC block/iscsi.o
qemu/block/iscsi.c:338:24: error: 'iscsi_aiocb_info' defined but not used [-Werror=unused-const-variable=]
static const AIOCBInfo iscsi_aiocb_info = {
^~~~~~~~~~~~~~~~
qemu/block/iscsi.c:168:1: error: 'iscsi_schedule_bh' defined but not used [-Werror=unused-function]
iscsi_schedule_bh(IscsiAIOCB *acb)
^~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errorsAdd guards to restrict this code for Linux.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>
---
There are various Linux specific code, we could split it out to another file such block/iscsi-lnx.o and guard with Makefile, but that's another patch.
block/iscsi.c | 7 +++++++ 1 file changed, 7 insertions(+)
block/iscsi.c +7 -0
@@ -145,6 +145,8 @@ static const unsigned iscsi_retry_times[] = {8, 32, 128, 512, 2048, 8192, 32768}* unallocated. */ #define ISCSI_CHECKALLOC_THRES 64 +#ifdef __linux__ +static void iscsi_bh_cb (void *p) {
@@ -172,6 +174,8 @@ iscsi_schedule_bh(IscsiAIOCB *acb) qemu_bh_schedule(acb->bh); } +#endif +static void iscsi_co_generic_bh_cb (void *opaque) {struct IscsiTask *iTask = opaque;
@@ -290,6 +294,8 @@ static void iscsi_co_init_iscsitask(IscsiLun *iscsilun, struct IscsiTask *iTask) }; } +#ifdef __linux__ +/* Called (via iscsi_service) with QemuMutex held. */ static void iscsi_abort_task_cb(struct iscsi_context *iscsi, int status, void *command_data,
@@ -338,6 +344,7 @@ static const AIOCBInfo iscsi_aiocb_info = { .cancel_async = iscsi_aio_cancel, }; +#endif static void iscsi_process_read (void *arg);static void iscsi_process_write (void *arg);
Signature · 1 line
2.20.1
Paolo Bonzini
AppliedQuoted 59 lines · Philippe Mathieu-Daudé
Some Linux specific code is missing guards, leading to build failure on OSX:
$ sudo brew install libiscsi $ ./configure && make [...] CC block/iscsi.o qemu/block/iscsi.c:338:24: error: 'iscsi_aiocb_info' defined but not used [-Werror=unused-const-variable=] static const AIOCBInfo iscsi_aiocb_info = { ^~~~~~~~~~~~~~~~ qemu/block/iscsi.c:168:1: error: 'iscsi_schedule_bh' defined but not used [-Werror=unused-function] iscsi_schedule_bh(IscsiAIOCB *acb) ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errorsAdd guards to restrict this code for Linux.
Signed-off-by Philippe Mathieu-Daudé <[email protected]>---
There are various Linux specific code, we could split it out to another file suchblock/iscsi-lnx.oand guard withMakefile, but that's another patch.block/iscsi.c | 7 +++++++ 1 file changed, 7 insertions(+)block/iscsi.c +6
-0@@ -145,6 +145,8 @@ static const unsigned iscsi_retry_times[] = {8, 32, 128, 512, 2048, 8192, 32768}* unallocated. */ #define ISCSI_CHECKALLOC_THRES 64 +#ifdef __linux__ +static void iscsi_bh_cb (void *p) {@@ -172,6 +174,8 @@ iscsi_schedule_bh(IscsiAIOCB *acb) qemu_bh_schedule(acb->bh); } +#endif +static void iscsi_co_generic_bh_cb (void *opaque) {struct IscsiTask *iTask = opaque;@@ -290,6 +294,8 @@ static void iscsi_co_init_iscsitask(IscsiLun *iscsilun, struct IscsiTask *iTask) }; } +#ifdef __linux__ +/* Called (via iscsi_service) with QemuMutex held. */ static void iscsi_abort_task_cb(struct iscsi_context *iscsi, int status, void *command_data,
block/iscsi.c static const AIOCBInfo iscsi_aiocb_info = { · line 350
Quoted 7 lines
block/iscsi.c +1
-0@@ -338,6 +344,7 @@ static const AIOCBInfo iscsi_aiocb_info = { .cancel_async = iscsi_aio_cancel, }; +#endif static void iscsi_process_read (void *arg);static void iscsi_process_write (void *arg);
Queued, thanks.
Paolo