From patchwork Mon Nov 3 17:04:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 406302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id C81B3140082 for ; Tue, 4 Nov 2014 04:05:58 +1100 (AEDT) Received: from localhost ([::1]:36324 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlL4m-00039s-Pu for incoming@patchwork.ozlabs.org; Mon, 03 Nov 2014 12:05:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35023) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlL3l-0001d4-Cx for qemu-devel@nongnu.org; Mon, 03 Nov 2014 12:04:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XlL3e-0001x7-9Z for qemu-devel@nongnu.org; Mon, 03 Nov 2014 12:04:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XlL3e-0001wy-32 for qemu-devel@nongnu.org; Mon, 03 Nov 2014 12:04:46 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sA3H4eY6021628 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 3 Nov 2014 12:04:40 -0500 Received: from localhost (dhcp-192-247.str.redhat.com [10.33.192.247]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sA3H4cdU027495 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO); Mon, 3 Nov 2014 12:04:39 -0500 From: Max Reitz To: qemu-devel@nongnu.org Date: Mon, 3 Nov 2014 18:04:22 +0100 Message-Id: <1415034271-8774-4-git-send-email-mreitz@redhat.com> In-Reply-To: <1415034271-8774-1-git-send-email-mreitz@redhat.com> References: <1415034271-8774-1-git-send-email-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Peter Lieven , Max Reitz , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 03/12] qcow2: Create metadata list X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index ed88d69..f80f9ed 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -744,6 +744,13 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, overlap_check_template & (1 << i)) << i; } + if (s->overlap_check) { + 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 */ @@ -1006,6 +1013,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; } @@ -1444,6 +1452,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)