From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVqA-0004Ug-6U for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TvVq7-0007QP-Br for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:50 -0500 Received: from nodalink.pck.nerim.net ([62.212.105.220]:43320 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TvVq6-0007QA-UN for qemu-devel@nongnu.org; Wed, 16 Jan 2013 11:27:47 -0500 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 16 Jan 2013 17:24:55 +0100 Message-Id: <1358353497-5292-35-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 34/36] qcow2: Add qcow2_dedup_init and qcow2_dedup_close. 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 | 97 +++++++++++++++++++++++++++++++++++++++++++++++++++ block/qcow2.h | 2 ++ 2 files changed, 99 insertions(+) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 50ffa54..35fcc01 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -1019,3 +1019,100 @@ bool qcow2_dedup_is_running(BlockDriverState *bs) BDRVQcowState *s = bs->opaque; return s->has_dedup && s->dedup_status == QCOW_DEDUP_STARTED; } + +static gint qcow2_dedup_compare_by_hash(gconstpointer a, + gconstpointer b, + gpointer data) +{ + QCowHash *hash_a = (QCowHash *) a; + QCowHash *hash_b = (QCowHash *) b; + return memcmp(hash_a->data, hash_b->data, HASH_LENGTH); +} + +static void qcow2_dedup_destroy_qcow_hash_node(gpointer p) +{ + QCowHashNode *hash_node = (QCowHashNode *) p; + g_free(hash_node); +} + +static gint qcow2_dedup_compare_by_offset(gconstpointer a, + gconstpointer b, + gpointer data) +{ + uint64_t offset_a = *((uint64_t *) a); + uint64_t offset_b = *((uint64_t *) b); + + if (offset_a > offset_b) { + return 1; + } + if (offset_a < offset_b) { + return -1; + } + return 0; +} + +static int qcow2_dedup_alloc(BlockDriverState *bs) +{ + BDRVQcowState *s = bs->opaque; + int ret; + + ret = qcow2_do_table_init(bs, + &s->dedup_table, + s->dedup_table_offset, + s->dedup_table_size, + false); + + if (ret < 0) { + return ret; + } + + s->dedup_tree_by_hash = g_tree_new_full(qcow2_dedup_compare_by_hash, NULL, + NULL, + qcow2_dedup_destroy_qcow_hash_node); + s->dedup_tree_by_sect = g_tree_new_full(qcow2_dedup_compare_by_offset, + NULL, NULL, NULL); + + s->dedup_cluster_cache = qcow2_cache_create(bs, DEDUP_CACHE_SIZE, + s->hash_block_size); + + return 0; +} + +static void qcow2_dedup_free(BlockDriverState *bs) +{ + BDRVQcowState *s = bs->opaque; + g_free(s->dedup_table); + + qcow2_cache_flush(bs, s->dedup_cluster_cache); + qcow2_cache_destroy(bs, s->dedup_cluster_cache); + g_tree_destroy(s->dedup_tree_by_sect); + g_tree_destroy(s->dedup_tree_by_hash); +} + +int qcow2_dedup_init(BlockDriverState *bs) +{ + BDRVQcowState *s = bs->opaque; + int ret = 0; + + s->has_dedup = true; + + ret = qcow2_dedup_alloc(bs); + + if (ret < 0) { + return ret; + } + + /* if we are read-only we don't load the deduplication table */ + if (bs->read_only) { + return 0; + } + + s->dedup_status = QCOW_DEDUP_STARTING; + + return 0; +} + +void qcow2_dedup_close(BlockDriverState *bs) +{ + qcow2_dedup_free(bs); +} diff --git a/block/qcow2.h b/block/qcow2.h index 9f5d0f0..29267a9 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -507,5 +507,7 @@ void qcow2_dedup_refcount_zero_reached(BlockDriverState *bs, void qcow2_dedup_refcount_half_max_reached(BlockDriverState *bs, uint64_t cluster_index); bool qcow2_dedup_is_running(BlockDriverState *bs); +int qcow2_dedup_init(BlockDriverState *bs); +void qcow2_dedup_close(BlockDriverState *bs); #endif -- 1.7.10.4