From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5DZj-0004zA-S7 for qemu-devel@nongnu.org; Thu, 10 Jul 2014 08:35:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X5DZY-00074H-5p for qemu-devel@nongnu.org; Thu, 10 Jul 2014 08:35:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:64215) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X5DZX-00074A-P7 for qemu-devel@nongnu.org; Thu, 10 Jul 2014 08:35:36 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s6ACZZjw007916 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 10 Jul 2014 08:35:35 -0400 From: Kevin Wolf Date: Thu, 10 Jul 2014 14:35:07 +0200 Message-Id: <1404995727-27471-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1404995727-27471-1-git-send-email-kwolf@redhat.com> References: <1404995727-27471-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PULL for-2.1 02/22] block: Fix bdrv_is_allocated() return value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com bdrv_is_allocated() should return either 0 or 1 in successful cases. We're lucky that currently, the callers that rely on this (e.g. because they check for ret == 1) don't seem to break badly. They just might skip some optimisation or in the case of qemu-io 'map' print separate lines where a single line would suffice. In theory, a wrong allocation status could lead to image corruption with certain operations, so let's fix this quickly. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block.c b/block.c index 8800a6b..c9629a4 100644 --- a/block.c +++ b/block.c @@ -4040,7 +4040,7 @@ int coroutine_fn bdrv_is_allocated(BlockDriverState *bs, int64_t sector_num, if (ret < 0) { return ret; } - return (ret & BDRV_BLOCK_ALLOCATED); + return !!(ret & BDRV_BLOCK_ALLOCATED); } /* -- 1.8.3.1