From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2MT6-0004Ch-6a for qemu-devel@nongnu.org; Thu, 25 Jul 2013 10:24:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2MT5-0007zw-0h for qemu-devel@nongnu.org; Thu, 25 Jul 2013 10:24:36 -0400 Received: from mail-ye0-x235.google.com ([2607:f8b0:4002:c04::235]:52293) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2MT4-0007zq-To for qemu-devel@nongnu.org; Thu, 25 Jul 2013 10:24:34 -0400 Received: by mail-ye0-f181.google.com with SMTP id q2so199994yen.12 for ; Thu, 25 Jul 2013 07:24:34 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 25 Jul 2013 16:23:13 +0200 Message-Id: <1374762197-7261-16-git-send-email-pbonzini@redhat.com> In-Reply-To: <1374762197-7261-1-git-send-email-pbonzini@redhat.com> References: <1374762197-7261-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v3 15/19] block: use bdrv_has_zero_init to return BDRV_BLOCK_ZERO List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pl@kamp.de, stefanha@redhat.com Alternatively, this could use a "discard zeroes data" flag returned by bdrv_get_info. Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- block.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 7cfbf71..fc1da56 100644 --- a/block.c +++ b/block.c @@ -2991,6 +2991,7 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, int nb_sectors, int *pnum) { int64_t n; + int64_t ret; if (sector_num >= bs->total_sectors) { *pnum = 0; @@ -3007,7 +3008,12 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, return BDRV_BLOCK_DATA; } - return bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, pnum); + ret = bs->drv->bdrv_co_get_block_status(bs, sector_num, nb_sectors, pnum); + if (!(ret & BDRV_BLOCK_DATA) && bdrv_has_zero_init(bs)) { + ret |= BDRV_BLOCK_ZERO; + } + + return ret; } /* Coroutine wrapper for bdrv_get_block_status() */ -- 1.8.3.1