From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VN2KI-00065V-FJ for qemu-devel@nongnu.org; Fri, 20 Sep 2013 11:09:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VN2KC-0007wo-BU for qemu-devel@nongnu.org; Fri, 20 Sep 2013 11:08:58 -0400 Received: from mail-ea0-x232.google.com ([2a00:1450:4013:c01::232]:64622) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VN2KC-0007wa-4x for qemu-devel@nongnu.org; Fri, 20 Sep 2013 11:08:52 -0400 Received: by mail-ea0-f178.google.com with SMTP id a15so332621eae.9 for ; Fri, 20 Sep 2013 08:08:51 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 20 Sep 2013 17:08:35 +0200 Message-Id: <1379689715-628-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1379689715-628-1-git-send-email-pbonzini@redhat.com> References: <1379689715-628-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 6/6] block/iscsi: Drop iscsi_co_get_block_status for older versions of libiscsi List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil From: Stefan Weil 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(+) diff --git a/block/iscsi.c b/block/iscsi.c index 68f99d3..6222ea9 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, -- 1.8.3.1