From patchwork Tue Sep 24 13:35:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 277501 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C0E822C00C9 for ; Tue, 24 Sep 2013 23:43:13 +1000 (EST) Received: from localhost ([::1]:46137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOStT-0003GU-T9 for incoming@patchwork.ozlabs.org; Tue, 24 Sep 2013 09:43:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOSpD-0006gW-9n for qemu-devel@nongnu.org; Tue, 24 Sep 2013 09:38:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VOSp7-0005GW-NA for qemu-devel@nongnu.org; Tue, 24 Sep 2013 09:38:47 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:56038 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VOSp7-0005GC-Cm for qemu-devel@nongnu.org; Tue, 24 Sep 2013 09:38:41 -0400 Received: (qmail 13920 invoked by uid 89); 24 Sep 2013 13:38:40 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2010/03/19-MF (clamdscan: 0.98/17892. hbedv: 8.2.12.122/7.11.104.28. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.069066 secs); 24 Sep 2013 13:38:40 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 24 Sep 2013 13:38:39 -0000 Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id 6F6E6206BA; Tue, 24 Sep 2013 15:35:16 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 6AACC61461; Tue, 24 Sep 2013 15:35:16 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 24 Sep 2013 15:35:11 +0200 Message-Id: <1380029714-5239-18-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380029714-5239-1-git-send-email-pl@kamp.de> References: <1380029714-5239-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, ronniesahlberg@gmail.com, Peter Lieven , stefanha@redhat.com, anthony@codemonkey.ws, pbonzini@redhat.com Subject: [Qemu-devel] [PATCHv3 17/20] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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. Reviewed-by: Eric Blake Signed-off-by: Peter Lieven --- block.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index f56660d..032809a 100644 --- a/block.c +++ b/block.c @@ -3263,8 +3263,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;