From f2564d88fe7949bdb5ca4ad652282c28b3da6210 Mon Sep 17 00:00:00 2001 From: Jeff Cody Date: Mon, 19 May 2014 17:13:06 -0400 Subject: [PATCH] block: iscsi build fix if LIBISCSI_FEATURE_IOVECTOR is not defined Commit b03c380 introduced the function iscsi_allocationmap_is_allocated(), however it is only used within a code block that is conditionally compiled. This produces a warning (error with -werror) of "defined but not used" for the the function, if LIBISCSI_FEATURE_IOVECTOR is not defined. This wraps iscsi_allocationmap_is_allocated() in the same conditional. Signed-off-by: Jeff Cody Signed-off-by: Paolo Bonzini --- block/iscsi.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index 65bf97d674..1b4af77a7f 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -381,6 +381,7 @@ retry: } +#if defined(LIBISCSI_FEATURE_IOVECTOR) static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun, int64_t sector_num, int nb_sectors) { @@ -393,9 +394,6 @@ static bool iscsi_allocationmap_is_allocated(IscsiLun *iscsilun, sector_num / iscsilun->cluster_sectors) == size); } - -#if defined(LIBISCSI_FEATURE_IOVECTOR) - static int64_t coroutine_fn iscsi_co_get_block_status(BlockDriverState *bs, int64_t sector_num, int nb_sectors, int *pnum) -- 2.11.4.GIT