From nobody Tue Apr 15 11:33:47 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552051110703247.44506100764204; Fri, 8 Mar 2019 05:18:30 -0800 (PST) Received: from localhost ([127.0.0.1]:42925 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2FOL-00072Y-Kg for importer@patchew.org; Fri, 08 Mar 2019 08:18:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2F63-0000LG-O7 for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:59:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2F60-0000OG-KS for qemu-devel@nongnu.org; Fri, 08 Mar 2019 07:59:30 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60408) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2F5u-0007mC-Hf; Fri, 08 Mar 2019 07:59:22 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C2F58C03BD54; Fri, 8 Mar 2019 12:59:16 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-27.ams2.redhat.com [10.36.117.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id B08025D704; Fri, 8 Mar 2019 12:59:15 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 8 Mar 2019 13:58:15 +0100 Message-Id: <20190308125823.32535-26-kwolf@redhat.com> In-Reply-To: <20190308125823.32535-1-kwolf@redhat.com> References: <20190308125823.32535-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 08 Mar 2019 12:59:16 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 25/33] qcow2: Creating images with external data file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This adds a .bdrv_create option to use an external data file. Signed-off-by: Kevin Wolf --- qapi/block-core.json | 4 ++++ include/block/block_int.h | 1 + block/qcow2.c | 26 ++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/qapi/block-core.json b/qapi/block-core.json index de4d4fd0e4..2303266bc4 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -4135,6 +4135,9 @@ # Driver specific image creation options for qcow2. # # @file Node to create the image format on +# @data-file Node to use as an external data file in which all guest +# data is stored so that only metadata remains in the qc= ow2 +# file (since: 4.0) # @size Size of the virtual disk in bytes # @version Compatibility level (default: v3) # @backing-file File name of the backing file if a backing file @@ -4150,6 +4153,7 @@ ## { 'struct': 'BlockdevCreateOptionsQcow2', 'data': { 'file': 'BlockdevRef', + '*data-file': 'BlockdevRef', 'size': 'size', '*version': 'BlockdevQcow2Version', '*backing-file': 'str', diff --git a/include/block/block_int.h b/include/block/block_int.h index 836d67c1ae..acd29ce521 100644 --- a/include/block/block_int.h +++ b/include/block/block_int.h @@ -56,6 +56,7 @@ #define BLOCK_OPT_NOCOW "nocow" #define BLOCK_OPT_OBJECT_SIZE "object_size" #define BLOCK_OPT_REFCOUNT_BITS "refcount_bits" +#define BLOCK_OPT_DATA_FILE "data_file" =20 #define BLOCK_PROBE_BUF_SIZE 512 =20 diff --git a/block/qcow2.c b/block/qcow2.c index ddbf8731bd..c20141b4e7 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2880,6 +2880,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) */ BlockBackend *blk =3D NULL; BlockDriverState *bs =3D NULL; + BlockDriverState *data_bs =3D NULL; QCowHeader *header; size_t cluster_size; int version; @@ -2976,6 +2977,20 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) } refcount_order =3D ctz32(qcow2_opts->refcount_bits); =20 + if (qcow2_opts->data_file) { + if (version < 3) { + error_setg(errp, "External data files are only supported with " + "compatibility level 1.1 and above (use version=3Dv= 3 or " + "greater)"); + ret =3D -EINVAL; + goto out; + } + data_bs =3D bdrv_open_blockdev_ref(qcow2_opts->data_file, errp); + if (bs =3D=3D NULL) { + ret =3D -EIO; + goto out; + } + } =20 /* Create BlockBackend to write to the image */ blk =3D blk_new(BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL); @@ -3014,6 +3029,10 @@ qcow2_co_create(BlockdevCreateOptions *create_option= s, Error **errp) header->compatible_features |=3D cpu_to_be64(QCOW2_COMPAT_LAZY_REFCOUNTS); } + if (data_bs) { + header->incompatible_features |=3D + cpu_to_be64(QCOW2_INCOMPAT_DATA_FILE); + } =20 ret =3D blk_pwrite(blk, 0, header, cluster_size, 0); g_free(header); @@ -3044,6 +3063,9 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) options =3D qdict_new(); qdict_put_str(options, "driver", "qcow2"); qdict_put_str(options, "file", bs->node_name); + if (data_bs) { + qdict_put_str(options, "data-file", data_bs->node_name); + } blk =3D blk_new_open(NULL, NULL, options, BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_NO_FLUSH, &local_err); @@ -3116,6 +3138,9 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) options =3D qdict_new(); qdict_put_str(options, "driver", "qcow2"); qdict_put_str(options, "file", bs->node_name); + if (data_bs) { + qdict_put_str(options, "data-file", data_bs->node_name); + } blk =3D blk_new_open(NULL, NULL, options, BDRV_O_RDWR | BDRV_O_NO_BACKING | BDRV_O_NO_IO, &local_err); @@ -3129,6 +3154,7 @@ qcow2_co_create(BlockdevCreateOptions *create_options= , Error **errp) out: blk_unref(blk); bdrv_unref(bs); + bdrv_unref(data_bs); return ret; } =20 --=20 2.20.1