From mboxrd@z Thu Jan 1 00:00:00 1970 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 From: Stefan Hajnoczi 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> Subject: [Qemu-devel] [PATCH 03/23] qcow2: Fix "total clusters" number in bdrv_check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Anthony Liguori , Stefan Hajnoczi 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 . ---------------------------------------------------------------------- -- 1.8.1.4