From patchwork Tue Mar 26 16:49:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 231454 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2FD592C0092 for ; Wed, 27 Mar 2013 03:51:12 +1100 (EST) Received: from localhost ([::1]:53811 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKX5Y-0002u0-CX for incoming@patchwork.ozlabs.org; Tue, 26 Mar 2013 12:51:08 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55262) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKX4p-0002pv-Ie for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKX4n-00019J-Sz for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:50:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57707) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKX4n-00019D-LF for qemu-devel@nongnu.org; Tue, 26 Mar 2013 12:50:21 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2QGoLwr009466 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 26 Mar 2013 12:50:21 -0400 Received: from dhcp-200-207.str.redhat.com (ovpn-116-61.ams2.redhat.com [10.36.116.61]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2QGoG2m030068; Tue, 26 Mar 2013 12:50:19 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Tue, 26 Mar 2013 17:49:54 +0100 Message-Id: <1364316613-31223-3-git-send-email-kwolf@redhat.com> In-Reply-To: <1364316613-31223-1-git-send-email-kwolf@redhat.com> References: <1364316613-31223-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 02/21] qcow2: Fix "total clusters" number in bdrv_check 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 should be based on the virtual disk size, not on the size of the image. Interesting observation: With some VM state stored in the image file, percentages higher than 100% are possible, even though snapshots themselves are ignored. This is a qcow2 bug to be fixed another day: The VM state should be discarded in the active L2 tables after completing the snapshot creation. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake --- block/qcow2-refcount.c | 4 +++- tests/qemu-iotests/044.out | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 9bfb390..c38e970 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1152,9 +1152,11 @@ int qcow2_check_refcounts(BlockDriverState *bs, BdrvCheckResult *res, size = bdrv_getlength(bs->file); nb_clusters = size_to_clusters(s, size); - res->bfi.total_clusters = nb_clusters; refcount_table = g_malloc0(nb_clusters * sizeof(uint16_t)); + res->bfi.total_clusters = + size_to_clusters(s, bs->total_sectors * BDRV_SECTOR_SIZE); + /* header */ inc_refcounts(bs, res, refcount_table, nb_clusters, 0, s->cluster_size); diff --git a/tests/qemu-iotests/044.out b/tests/qemu-iotests/044.out index 5eed3f8..34c25c7 100644 --- a/tests/qemu-iotests/044.out +++ b/tests/qemu-iotests/044.out @@ -1,5 +1,5 @@ No errors were found on the image. -7292415/8391499= 86.90% allocated, 0.00% fragmented, 0.00% compressed clusters +7292415/33554432 = 21.73% allocated, 0.00% fragmented, 0.00% compressed clusters Image end offset: 4296447488 . ----------------------------------------------------------------------