From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRPtj-00009B-Sr for qemu-devel@nongnu.org; Wed, 02 Oct 2013 13:07:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VRPtc-0001w5-Cw for qemu-devel@nongnu.org; Wed, 02 Oct 2013 13:07:39 -0400 Received: from v220110690675601.yourvserver.net ([37.221.199.173]:35287) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VRPtc-0001vu-6b for qemu-devel@nongnu.org; Wed, 02 Oct 2013 13:07:32 -0400 Message-ID: <524C52C2.3060602@weilnetz.de> Date: Wed, 02 Oct 2013 19:07:14 +0200 From: Stefan Weil MIME-Version: 1.0 References: <1380714728-3739-1-git-send-email-pl@kamp.de> In-Reply-To: <1380714728-3739-1-git-send-email-pl@kamp.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] block/iscsi: reenable iscsi_co_get_block_status List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Lieven , qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, anthony@codemonkey.ws, ronniesahlberg@gmail.com, stefanha@redhat.com Am 02.10.2013 13:52, schrieb Peter Lieven: > 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: Peter Lieven > --- > block/iscsi.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/block/iscsi.c b/block/iscsi.c > index 6152ef1..a2a961e 100644 > --- a/block/iscsi.c > +++ b/block/iscsi.c > @@ -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, Reviewed-by: Stefan Weil