@@ -1095,7 +1095,7 @@ static int check_dedup_l2(BlockDriverState *bs, BdrvCheckResult *res,
int i, l2_size;
/* Read L2 table from disk */
- l2_size = s->cluster_size;
+ l2_size = s->hash_block_size;
l2_table = g_malloc(l2_size);
if (bdrv_pread(bs->file, l2_offset, l2_table, l2_size) != l2_size) {
@@ -1185,7 +1185,8 @@ static int check_refcounts_l1(BlockDriverState *bs,
/* Mark L2 table as used */
l2_offset &= L1E_OFFSET_MASK;
inc_refcounts(bs, res, refcount_table, refcount_table_size,
- l2_offset, s->cluster_size);
+ l2_offset,
+ dedup ? s->hash_block_size : s->l2_size * sizeof(uint64_t));
/* L2 tables are cluster aligned */
if (l2_offset & (s->cluster_size - 1)) {
@@ -426,6 +426,9 @@ static int qcow2_open(BlockDriverState *bs, int flags)
s->cluster_sectors = 1 << (s->cluster_bits - 9);
s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */
s->l2_size = 1 << s->l2_bits;
+ if (s->incompatible_features & QCOW2_INCOMPAT_DEDUP) {
+ s->hash_block_size = DEFAULT_CLUSTER_SIZE * 5;
+ }
bs->total_sectors = header.size / 512;
s->csize_shift = (62 - (s->cluster_bits - 8));
s->csize_mask = (1 << (s->cluster_bits - 8)) - 1;
Signed-off-by: Benoit Canet <benoit@irqsave.net> --- block/qcow2-refcount.c | 5 +++-- block/qcow2.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-)