From patchwork Thu Mar 28 16:40:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 232118 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 7F9022C0095 for ; Fri, 29 Mar 2013 03:49:23 +1100 (EST) Received: from localhost ([::1]:35705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFvy-0001Kb-WA for incoming@patchwork.ozlabs.org; Thu, 28 Mar 2013 12:44:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFso-0005Ib-PY for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ULFsk-0002AA-JW for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:40:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ULFsk-00029y-Ar for qemu-devel@nongnu.org; Thu, 28 Mar 2013 12:40:54 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2SGerVq031621 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 28 Mar 2013 12:40:53 -0400 Received: from localhost (ovpn-112-23.ams2.redhat.com [10.36.112.23]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r2SGeqsw008687; Thu, 28 Mar 2013 12:40:53 -0400 From: Stefan Hajnoczi To: Date: Thu, 28 Mar 2013 17:40:17 +0100 Message-Id: <1364488837-15916-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1364488837-15916-1-git-send-email-stefanha@redhat.com> References: <1364488837-15916-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 03/23] 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 From: Kevin Wolf 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 Signed-off-by: Stefan Hajnoczi --- 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 . ----------------------------------------------------------------------