proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-09 11:43:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

block/iscsi: reenable iscsi_co_get_block_status

Browse Source 
Commit f35c934a accidently disabled iscsi_co_get_block_status for all
libiscsi versions. Its not possible to check for enumeration constants
in the C preprocessor. This patch changes the check to the preprocessor
constant LIBISCSI_FEATURE_IOVECTOR which was introduced shortly after
get_lba_status support was added to libiscsi.

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Lieven 2013-10-02 13:52:08 +02:00 committed by Paolo Bonzini
parent a684f3cf9b
commit 24c7608a5d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/iscsi.c
View File

@ -811,7 +811,7 @@ iscsi_getlength(BlockDriverState *bs)
return len; return len;
} }
#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED) #if defined(LIBISCSI_FEATURE_IOVECTOR)
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,
@ -903,7 +903,7 @@ out:
return ret; return ret;
} }
#endif /* SCSI_PROVISIONING_TYPE_DEALLOCATED */ #endif /* LIBISCSI_FEATURE_IOVECTOR */
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,
@ -1529,7 +1529,7 @@ 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) #if defined(LIBISCSI_FEATURE_IOVECTOR)
.bdrv_co_get_block_status = iscsi_co_get_block_status, .bdrv_co_get_block_status = iscsi_co_get_block_status,
#endif #endif
.bdrv_co_discard = iscsi_co_discard, .bdrv_co_discard = iscsi_co_discard,