From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:53287) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR0M-0001UA-Hx for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TqR0J-00065y-OO for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:22 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:56210 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TqR0J-00065o-Fi for qemu-devel@nongnu.org; Wed, 02 Jan 2013 11:17:19 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 2 Jan 2013 17:16:13 +0100 Message-Id: <1357143393-29832-11-git-send-email-benoit@irqsave.net> In-Reply-To: <1357143393-29832-1-git-send-email-benoit@irqsave.net> References: <1357143393-29832-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V4 10/30] qcow2: Add qcow2_dedup_grow_table and use it. 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-dedup.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 7adaaba..b998a2d 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -38,6 +38,44 @@ static int qcow2_dedup_read_write_hash(BlockDriverState *bs, bool write); /* + * Save the dedup table information into the header extensions + * + * @table_offset: the dedup table offset in the QCOW2 file + * @size: the size of the dedup table + * @ret: 0 on success, -errno on error + */ +static int qcow2_dedup_save_table_info(BlockDriverState *bs, + int64_t table_offset, int size) +{ + BDRVQcowState *s = bs->opaque; + s->dedup_table_offset = table_offset; + s->dedup_table_size = size; + return qcow2_update_header(bs); +} + +/* + * Grow the deduplication table + * + * @min_size: minimal size + * @exact_size: if true force to grow to the exact size + * @ret: 0 on success, -errno on error + */ +static int qcow2_dedup_grow_table(BlockDriverState *bs, + int min_size, + bool exact_size) +{ + BDRVQcowState *s = bs->opaque; + return qcow2_do_grow_table(bs, + min_size, + exact_size, + &s->dedup_table, + &s->dedup_table_offset, + &s->dedup_table_size, + qcow2_dedup_save_table_info, + "dedup"); +} + +/* * Prepare a buffer containing all the required data required to compute cluster * sized deduplication hashes. * If sector_num or nb_sectors are not cluster-aligned, missing data @@ -712,7 +750,11 @@ static int qcow2_dedup_read_write_hash(BlockDriverState *bs, index_in_dedup_table = cluster_number / nb_hash_in_block; if (s->dedup_table_size <= index_in_dedup_table) { - return -ENOSPC; + ret = qcow2_dedup_grow_table(bs, index_in_dedup_table + 1, false); + } + + if (ret < 0) { + return ret; } /* if we must read and there is nothing to read return a null hash */ -- 1.7.10.4