From patchwork Sat Aug 16 18:54:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 380497 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 22253140097 for ; Sun, 17 Aug 2014 04:55:12 +1000 (EST) Received: from localhost ([::1]:36352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIj8A-0004XL-Ao for incoming@patchwork.ozlabs.org; Sat, 16 Aug 2014 14:55:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIj7a-0003Yw-Ob for qemu-devel@nongnu.org; Sat, 16 Aug 2014 14:54:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XIj7Q-0001wN-Ti for qemu-devel@nongnu.org; Sat, 16 Aug 2014 14:54:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55677) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XIj7Q-0001wJ-Lm for qemu-devel@nongnu.org; Sat, 16 Aug 2014 14:54:24 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7GIsNLK005360 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 16 Aug 2014 14:54:24 -0400 Received: from localhost (ovpn-116-43.ams2.redhat.com [10.36.116.43]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7GIsLGO009312 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Sat, 16 Aug 2014 14:54:23 -0400 From: Max Reitz To: qemu-devel@nongnu.org Date: Sat, 16 Aug 2014 20:54:16 +0200 Message-Id: <1408215258-12545-2-git-send-email-mreitz@redhat.com> In-Reply-To: <1408215258-12545-1-git-send-email-mreitz@redhat.com> References: <1408215258-12545-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz Subject: [Qemu-devel] [PATCH 1/3] block: Ignore allocation size in underlying 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 When falling through to the underlying file in bdrv_co_get_block_status(), do not let the number of sectors for which information could be obtained be overwritten. Signed-off-by: Max Reitz Reviewed-by: Eric Blake --- block.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 3e252a2..c922664 100644 --- a/block.c +++ b/block.c @@ -3991,9 +3991,11 @@ 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)) { + int backing_pnum; + ret2 = bdrv_co_get_block_status(bs->file, ret >> BDRV_SECTOR_BITS, - *pnum, pnum); - if (ret2 >= 0) { + *pnum, &backing_pnum); + if (ret2 >= 0 && backing_pnum >= *pnum) { /* Ignore errors. This is just providing extra information, it * is useful but not necessary. */