mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block/iscsi: Drop iscsi_co_get_block_status for older versions of libiscsi

Browse Source 
Debian wheezy includes libiscsi-dev 1.4.0 which does not provide
SCSI_PROVISIONING_TYPE_DEALLOCATED. Drop iscsi_co_get_block_status
in this case to allow compilation without errors.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Stefan Weil 2013-09-17 19:33:49 +02:00 committed by Paolo Bonzini
parent ceae18bd74
commit f35c934a5a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/iscsi.c
View File

@ -811,6 +811,8 @@ iscsi_getlength(BlockDriverState *bs)
return len; return len;
} }
#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)
static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,
int64_t sector_num, int64_t sector_num,
int nb_sectors, int *pnum) int nb_sectors, int *pnum)
@ -901,6 +903,8 @@ out:
return ret; return ret;
} }
#endif /* SCSI_PROVISIONING_TYPE_DEALLOCATED */
static int static int
coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num, coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num,
int nb_sectors) int nb_sectors)
@ -1522,7 +1526,9 @@ static BlockDriver bdrv_iscsi = {
.bdrv_getlength = iscsi_getlength, .bdrv_getlength = iscsi_getlength,
.bdrv_truncate = iscsi_truncate, .bdrv_truncate = iscsi_truncate,
#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)
.bdrv_co_get_block_status = iscsi_co_get_block_status, .bdrv_co_get_block_status = iscsi_co_get_block_status,
#endif
.bdrv_co_discard = iscsi_co_discard, .bdrv_co_discard = iscsi_co_discard,
.bdrv_aio_readv = iscsi_aio_readv, .bdrv_aio_readv = iscsi_aio_readv,