Commit 24c7608a authored by Peter Lieven's avatar Peter Lieven Committed by Paolo Bonzini
Browse files

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: default avatarPeter Lieven <pl@kamp.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a684f3cf

block/iscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -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,