From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKty6-0005YT-NY for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:26:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YKty0-0003S1-PR for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:26:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54571) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YKty0-0003Rb-Hu for qemu-devel@nongnu.org; Mon, 09 Feb 2015 14:25:56 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19JPtRD020623 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 14:25:56 -0500 From: Max Reitz Date: Mon, 9 Feb 2015 14:25:41 -0500 Message-Id: <1423509950-7468-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1423509950-7468-1-git-send-email-mreitz@redhat.com> References: <1423509950-7468-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH v3 03/12] qcow2: Create metadata list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , 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 421c2e7..81016d8 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -744,6 +744,14 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, overlap_check_template & (1 << i)) << i; } + 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->l2_bits = s->cluster_bits - 3; /* L2 is always one cluster */ s->l2_size = 1 << s->l2_bits; /* 2^(s->refcount_order - 3) is the refcount width in bytes */ @@ -1007,6 +1015,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; } @@ -1458,6 +1467,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.1.0