From patchwork Thu Jul 25 14:23:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 261725 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 EA4012C00D1 for ; Fri, 26 Jul 2013 00:32:41 +1000 (EST) Received: from localhost ([::1]:35728 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2Mau-0008Kw-0Y for incoming@patchwork.ozlabs.org; Thu, 25 Jul 2013 10:32:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2MTJ-0004dF-2U for qemu-devel@nongnu.org; Thu, 25 Jul 2013 10:24:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V2MTH-00081q-CV for qemu-devel@nongnu.org; Thu, 25 Jul 2013 10:24:48 -0400 Received: from mail-gh0-x236.google.com ([2607:f8b0:4002:c05::236]:37631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V2MTH-00081e-9H for qemu-devel@nongnu.org; Thu, 25 Jul 2013 10:24:47 -0400 Received: by mail-gh0-f182.google.com with SMTP id z15so489833ghb.41 for ; Thu, 25 Jul 2013 07:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=LER94Oop1wAPMRKr8fiUhpEk9DfMrMSYRkOXKgJUR/8=; b=y0h/5v3aRwW/xyd2P0BLaLFCNyzxAZE7LokpAS6hHyVMB5DO3soXXJndFUFnZ7NLwC BNlZX43JFPALnEXGVli1l0Yw6eFmClKvvDGlCJXOJAYiZbdrMROOA31sNwwczK4z9Zaj NGm0UdluNvoOicCD5F/prockkRZK3SK3AtIsKlzHXPFWmqW3PmtSBuZ4VuhIHLyhxiTB L6zLGc0+PcLteHA3SoW0ChZK/mLAUYzbE7loikwUDMpis3UOcpSFyeCa9yVtM1rvfNmI WS2G6Q/uq3Lib1jK2xV0Rywe5ffrzUa4xE84cxVnF1PiIlFVjirc3bVOX9cDvIKyQfoo Eeng== X-Received: by 10.236.4.72 with SMTP id 48mr19153990yhi.209.1374762287027; Thu, 25 Jul 2013 07:24:47 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-2-39-8-162.cust.dsl.vodafone.it. [2.39.8.162]) by mx.google.com with ESMTPSA id b48sm58469338yhc.8.2013.07.25.07.24.44 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 25 Jul 2013 07:24:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 25 Jul 2013 16:23:17 +0200 Message-Id: <1374762197-7261-20-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1374762197-7261-1-git-send-email-pbonzini@redhat.com> References: <1374762197-7261-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c05::236 Cc: kwolf@redhat.com, pl@kamp.de, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v3 19/19] block: look for zero blocks in bs->file 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 Reviewed-by: Eric Blake Signed-off-by: Paolo Bonzini --- block.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/block.c b/block.c index 8738937..1493f22 100644 --- a/block.c +++ b/block.c @@ -2991,7 +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; + int64_t ret, ret2; if (sector_num >= bs->total_sectors) { *pnum = 0; @@ -3017,6 +3017,14 @@ static int64_t coroutine_fn bdrv_co_get_block_status(BlockDriverState *bs, ret |= BDRV_BLOCK_ZERO; } + 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); + ret |= (ret2 & BDRV_BLOCK_ZERO); + } + return ret; }