From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvi2-0000yy-V3 for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:53:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VLvhw-0002SS-6C for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:52:54 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:38004 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VLvhv-0002SC-Re for qemu-devel@nongnu.org; Tue, 17 Sep 2013 09:52:48 -0400 From: Peter Lieven Date: Tue, 17 Sep 2013 15:48:53 +0200 Message-Id: <1379425736-11326-18-git-send-email-pl@kamp.de> In-Reply-To: <1379425736-11326-1-git-send-email-pl@kamp.de> References: <1379425736-11326-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCHv2 17/20] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com this patch does 2 things: a) only do additional call outs if BDRV_BLOCK_ZERO is not already set. b) use the newly introduced bdrv_has_discard_zeroes() to return the zero state of an unallocated block. the used callout to bdrv_has_zero_init() is only valid right after bdrv_create. Signed-off-by: Peter Lieven --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 64fca1b..7d7ee0f 100644 --- a/block.c +++ b/block.c @@ -3192,8 +3192,8 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, return ret; } - if (!(ret & BDRV_BLOCK_DATA)) { - if (bdrv_has_zero_init(bs)) { + if (!(ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO)) { + if (bdrv_has_discard_zeroes(bs)) { ret |= BDRV_BLOCK_ZERO; } else if (bs->backing_hd) { BlockDriverState *bs2 = bs->backing_hd; -- 1.7.9.5