| Message ID | 1364232620-5293-2-git-send-email-kwolf@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 03/25/2013 11:30 AM, Kevin Wolf wrote: > 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 <kwolf@redhat.com> > --- > block/qcow2-refcount.c | 4 +++- > tests/qemu-iotests/044.out | 2 +- > 2 files changed, 4 insertions(+), 2 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
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 . ----------------------------------------------------------------------
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 <kwolf@redhat.com> --- block/qcow2-refcount.c | 4 +++- tests/qemu-iotests/044.out | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-)