From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHy9n-0005xX-9m for qemu-devel@nongnu.org; Fri, 06 Sep 2013 11:41:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VHy9h-0005kS-Bk for qemu-devel@nongnu.org; Fri, 06 Sep 2013 11:41:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14477) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VHy9h-0005kL-4V for qemu-devel@nongnu.org; Fri, 06 Sep 2013 11:41:05 -0400 From: Stefan Hajnoczi Date: Fri, 6 Sep 2013 17:39:10 +0200 Message-Id: <1378481953-23099-40-git-send-email-stefanha@redhat.com> In-Reply-To: <1378481953-23099-1-git-send-email-stefanha@redhat.com> References: <1378481953-23099-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 39/42] block: look for zero blocks in bs->file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Stefan Hajnoczi , Anthony Liguori From: Paolo Bonzini Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- block.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 3c39769..a325efc 100644 --- a/block.c +++ b/block.c @@ -3075,7 +3075,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, { int64_t length; int64_t n; - int64_t ret; + int64_t ret, ret2; length = bdrv_getlength(bs); if (length < 0) { @@ -3117,6 +3117,20 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, } } } + + if (bs->file && + (ret & BDRV_BLOCK_DATA) && !(ret & BDRV_BLOCK_ZERO) && + (ret & BDRV_BLOCK_OFFSET_VALID)) { + ret2 = bdrv_co_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS, + *pnum, pnum); + if (ret2 >= 0) { + /* Ignore errors. This is just providing extra information, it + * is useful but not necessary. + */ + ret |= (ret2 & BDRV_BLOCK_ZERO); + } + } + return ret; } -- 1.8.3.1