From f35c934a5add17eb549e3f7f4b8286605eb21e99 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Tue, 17 Sep 2013 19:33:49 +0200 Subject: 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: Stefan Weil Signed-off-by: Paolo Bonzini --- block/iscsi.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'block') diff --git a/block/iscsi.c b/block/iscsi.c index 68f99d3195..6222ea9d47 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -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, -- cgit v1.2.3