From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZN2ZA-0007Do-0d for qemu-devel@nongnu.org; Wed, 05 Aug 2015 13:33:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZN2Z8-0000wT-Kh for qemu-devel@nongnu.org; Wed, 05 Aug 2015 13:33:23 -0400 From: Max Reitz Date: Wed, 5 Aug 2015 19:32:51 +0200 Message-Id: <1438795985-21903-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1438795985-21903-1-git-send-email-mreitz@redhat.com> References: <1438795985-21903-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v6 03/17] qcow2: Create metadata list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: Kevin Wolf , qemu-devel@nongnu.org, Stefan Hajnoczi , Max Reitz Create and destroy the metadata list on creation and destruction of a qcow2 BDS, respectively. Skip creation if no overlap checks should be performed. Signed-off-by: Max Reitz --- block/qcow2.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 97b624a..d30d008 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -766,6 +766,14 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, s->csize_mask = (1 << (s->cluster_bits - 8)) - 1; s->cluster_offset_mask = (1LL << s->csize_shift) - 1; + if (s->overlap_check) { + /* TODO: Let the user override this default */ + ret = qcow2_create_empty_metadata_list(bs, 65536, errp); + if (ret < 0) { + goto fail; + } + } + s->refcount_table_offset = header.refcount_table_offset; s->refcount_table_size = header.refcount_table_clusters << (s->cluster_bits - 3); @@ -1021,6 +1029,7 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, } g_free(s->cluster_cache); qemu_vfree(s->cluster_data); + qcow2_metadata_list_destroy(bs); return ret; } @@ -1487,6 +1496,8 @@ static void qcow2_close(BlockDriverState *bs) qemu_vfree(s->cluster_data); qcow2_refcount_close(bs); qcow2_free_snapshots(bs); + + qcow2_metadata_list_destroy(bs); } static void qcow2_invalidate_cache(BlockDriverState *bs, Error **errp) -- 2.4.6