[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 02/21] qcow2: Fix "total clusters" number in bdrv
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH v2 02/21] qcow2: Fix "total clusters" number in bdrv_check |
Date: |
Tue, 26 Mar 2013 17:49:54 +0100 |
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 <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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
- [Qemu-devel] [PATCH v2 00/21] qcow2: Rework cluster allocation even more, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 02/21] qcow2: Fix "total clusters" number in bdrv_check,
Kevin Wolf <=
- [Qemu-devel] [PATCH v2 01/21] qemu-iotests: More concurrent allocation scenarios, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 04/21] qcow2: Handle dependencies earlier, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 03/21] qcow2: Remove bogus unlock of s->lock, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 06/21] qcow2: Change handle_dependency to byte granularity, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 08/21] qcow2: Factor out handle_alloc(), Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 07/21] qcow2: Decouple cluster allocation from cluster reuse code, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 05/21] qcow2: Improve check for overlapping allocations, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 09/21] qcow2: handle_alloc(): Get rid of nb_clusters parameter, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 10/21] qcow2: handle_alloc(): Get rid of keep_clusters parameter, Kevin Wolf, 2013/03/26
- [Qemu-devel] [PATCH v2 12/21] qcow2: Clean up handle_alloc(), Kevin Wolf, 2013/03/26