From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVq3-0004CT-MY for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVpy-0007Nw-9z for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:43 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43309 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVpy-0007Ns-2N for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:38 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 16 Jan 2013 17:24:53 +0100 Message-Id: <1358353497-5292-33-git-send-email-benoit@irqsave.net> In-Reply-To: <1358353497-5292-1-git-send-email-benoit@irqsave.net> References: <1358353497-5292-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V5 32/36] 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, pbonzini@redhat.com, =?UTF-8?q?Beno=C3=AEt=20Canet?= , stefanha@redhat.com Signed-off-by: Benoit Canet --- block/qcow2-refcount.c | 4 ++-- block/qcow2.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c index f305510..348342a 100644 --- a/block/qcow2-refcount.c +++ b/block/qcow2-refcount.c @@ -1063,7 +1063,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) { @@ -1153,7 +1153,7 @@ 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->l2_size << 3); + l2_offset, dedup ? s->hash_block_size : s->l2_size << 3); /* L2 tables are cluster aligned */ if (l2_offset & (s->cluster_size - 1)) { diff --git a/block/qcow2.c b/block/qcow2.c index f70c24b..bd7579a 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -434,6 +434,8 @@ static int qcow2_open(BlockDriverState *bs, int flags) s->cluster_sectors = 1 << (s->cluster_bits - 9); if (s->incompatible_features & QCOW2_INCOMPAT_DEDUP) { s->l2_bits = 17; /* 64 * 16 KB L2 to compensate smaller cluster size */ + s->l2_bits = 16 - 3; /* 64 KB L2 */ + s->hash_block_size = DEFAULT_CLUSTER_SIZE * 5; } else { s->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */ } -- 1.7.10.4