From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4U-000563-Pi for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOW4L-0003Jq-41 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:14 -0400 Received: from nodalink.pck.nerim.net ([62.212.105.220]:48820 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOW4K-0003JG-Su for qemu-devel@nongnu.org; Wed, 17 Oct 2012 12:02:05 -0400 From: =?UTF-8?q?Beno=C3=AEt=20Canet?= Date: Wed, 17 Oct 2012 18:00:27 +0200 Message-Id: <1350489629-1838-19-git-send-email-benoit@irqsave.net> In-Reply-To: <1350489629-1838-1-git-send-email-benoit@irqsave.net> References: <1350489629-1838-1-git-send-email-benoit@irqsave.net> Subject: [Qemu-devel] [RFC V2 18/20] qcow2: Add method to destroy the deduplication red black tree. 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 --- block/qcow2-dedup.c | 16 ++++++++++++++++ block/qcow2.h | 1 + 2 files changed, 17 insertions(+) diff --git a/block/qcow2-dedup.c b/block/qcow2-dedup.c index 72fab64..60e93fe 100644 --- a/block/qcow2-dedup.c +++ b/block/qcow2-dedup.c @@ -680,6 +680,22 @@ void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque) } /* + * This function walk in the red black tree remove the elements and free them. + */ +void qcow2_dedup_destroy_rb_tree(BlockDriverState *bs) +{ + BDRVQcowState *s = bs->opaque; + + while (!RB_EMPTY_ROOT(&s->dedup_rb_tree)) { + QCowHashNode *data = + rb_entry(s->dedup_rb_tree.rb_node, QCowHashNode, node); + rb_erase(&data->node, &s->dedup_rb_tree); + g_free(data->hash); + g_free(data); + } +} + +/* * Save the dedup table information into the header extensions * * @table_offset: the dedup table offset in the QCOW2 file diff --git a/block/qcow2.h b/block/qcow2.h index 0b999fb..1d629a7 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -390,6 +390,7 @@ int qcow2_dedup_write_new_hashes(BlockDriverState *bs, int count); void coroutine_fn qcow2_co_load_dedup_hashes(void *opaque); void qcow2_dedup_start_loading_hashes(BlockDriverState *bs); +void qcow2_dedup_destroy_rb_tree(BlockDriverState *bs); int qcow2_dedup_grow_table(BlockDriverState *bs, int min_size, bool exact_size); -- 1.7.10.4