From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsqTt-00052p-Ne for qemu-devel@nongnu.org; Thu, 14 May 2015 06:35:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YsqTq-0004m4-Dv for qemu-devel@nongnu.org; Thu, 14 May 2015 06:35:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34602) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YsqTq-0004kn-98 for qemu-devel@nongnu.org; Thu, 14 May 2015 06:35:06 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id D90428E6FA for ; Thu, 14 May 2015 10:35:05 +0000 (UTC) From: Paolo Bonzini Date: Thu, 14 May 2015 12:35:02 +0200 Message-Id: <1431599702-10431-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH] block: get_block_status: use "else" when testing the opposite condition List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, stefanha@redhat.com A bit of Boolean algebra (and common sense) tells us that the second "if" here is looking for blocks that are not allocated. This is the opposite of the "if" that sets BDRV_BLOCK_ALLOCATED, and thus it can use an "else". Signed-off-by: Paolo Bonzini --- block/io.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/block/io.c b/block/io.c index 1ce62c4..494e3b3 100644 --- a/block/io.c +++ b/block/io.c @@ -1456,9 +1456,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, if (ret & (BDRV_BLOCK_DATA | BDRV_BLOCK_ZERO)) { ret |= BDRV_BLOCK_ALLOCATED; - } - - if (!(ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO)) { + } else { if (bdrv_unallocated_blocks_are_zero(bs)) { ret |= BDRV_BLOCK_ZERO; } else if (bs->backing_hd) { -- 2.4.0