diff options
| author | Peter Lieven <pl@kamp.de> | 2013-10-02 13:52:08 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-10-09 10:43:42 +0200 |
| commit | 24c7608a5d973e5d562715998e9887f74deac794 (patch) | |
| tree | 6feca9713284edd8a6a4ac837b347623cb55ffb2 /block/iscsi.c | |
| parent | a684f3cf9b9b9c3cb82be87aafc463de8974610c (diff) | |
| download | qemu-24c7608a5d973e5d562715998e9887f74deac794.tar.gz qemu-24c7608a5d973e5d562715998e9887f74deac794.tar.bz2 qemu-24c7608a5d973e5d562715998e9887f74deac794.zip | |
block/iscsi: reenable iscsi_co_get_block_status
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>
Diffstat (limited to 'block/iscsi.c')
| -rw-r--r-- | block/iscsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/iscsi.c b/block/iscsi.c index 6152ef1891..a2a961e163 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -811,7 +811,7 @@ iscsi_getlength(BlockDriverState *bs) 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, int64_t sector_num, @@ -903,7 +903,7 @@ out: return ret; } -#endif /* SCSI_PROVISIONING_TYPE_DEALLOCATED */ +#endif /* LIBISCSI_FEATURE_IOVECTOR */ static int coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num, @@ -1529,7 +1529,7 @@ static BlockDriver bdrv_iscsi = { .bdrv_getlength = iscsi_getlength, .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, #endif .bdrv_co_discard = iscsi_co_discard, |