motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-15 06:01:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

block/iscsi: Restrict Linux-specific code

Browse source 
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 errors

Add guards to restrict this code for Linux.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190220000553.28438-1-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2019-02-20 01:05:53 +01:00 • committed by Paolo Bonzini
parent 5dc8ab361a
commit d4cef0c67c
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
block/iscsi.c
View file

@ -145,6 +145,8 @@ static const unsigned iscsi_retry_times[] = {8, 32, 128, 512, 2048, 8192, 32768}
* unallocated. */ * unallocated. */
#define ISCSI_CHECKALLOC_THRES 64 #define ISCSI_CHECKALLOC_THRES 64
#ifdef __linux__
static void static void
iscsi_bh_cb(void *p) iscsi_bh_cb(void *p)
{ {
@ -172,6 +174,8 @@ iscsi_schedule_bh(IscsiAIOCB *acb)
qemu_bh_schedule(acb->bh); qemu_bh_schedule(acb->bh);
} }
#endif
static void iscsi_co_generic_bh_cb(void *opaque) static void iscsi_co_generic_bh_cb(void *opaque)
{ {
struct IscsiTask *iTask = 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. */ /* Called (via iscsi_service) with QemuMutex held. */
static void static void
iscsi_abort_task_cb(struct iscsi_context *iscsi, int status, void *command_data, 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, .cancel_async = iscsi_aio_cancel,
}; };
#endif
static void iscsi_process_read(void *arg); static void iscsi_process_read(void *arg);
static void iscsi_process_write(void *arg); static void iscsi_process_write(void *arg);