From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVzl-00030B-32 for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:52:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UGVzh-0005KX-4n for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:52:33 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:59649 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UGVzg-0005KE-Q6 for qemu-devel@nongnu.org; Fri, 15 Mar 2013 10:52:29 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Fri, 15 Mar 2013 15:49:43 +0100 Message-Id: <1363358986-8360-30-git-send-email-benoit@irqsave.net> In-Reply-To: <1363358986-8360-1-git-send-email-benoit@irqsave.net> References: <1363358986-8360-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V7 29/32] qcow: Set large dedup hash block size. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Signed-off-by: Benoit Canet --- block/qcow2-refcount.c | 5 +++-- block/qcow2.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index 58d142f..7e74896 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -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)) { diff --git a/block/qcow2.c b/block/qcow2.c index 17b2fcb..96fc86a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -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; -- 1.7.10.4