Commit f35c934a authored by Stefan Weil's avatar Stefan Weil Committed by Paolo Bonzini
Browse files

block/iscsi: Drop iscsi_co_get_block_status for older versions of libiscsi 



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: default avatarStefan Weil <sw@weilnetz.de>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ceae18bd

block/iscsi.c

+6 −0
Original line number Diff line number Diff line
@@ -811,6 +811,8 @@ iscsi_getlength(BlockDriverState *bs) 
    return len;

}



#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)



static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs,

                                                  int64_t sector_num,

                                                  int nb_sectors, int *pnum)
@@ -901,6 +903,8 @@ out: 
    return ret;

}



#endif /* SCSI_PROVISIONING_TYPE_DEALLOCATED */



static int

coroutine_fn iscsi_co_discard(BlockDriverState *bs, int64_t sector_num,

                                   int nb_sectors)
@@ -1522,7 +1526,9 @@ static BlockDriver bdrv_iscsi = { 
    .bdrv_getlength  = iscsi_getlength,

    .bdrv_truncate   = iscsi_truncate,



#if defined(SCSI_PROVISIONING_TYPE_DEALLOCATED)

    .bdrv_co_get_block_status = iscsi_co_get_block_status,

#endif

    .bdrv_co_discard      = iscsi_co_discard,



    .bdrv_aio_readv  = iscsi_aio_readv,