From nobody Thu Dec 18 13:17:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.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 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520613138769691.1617524738848; Fri, 9 Mar 2018 08:32:18 -0800 (PST) Received: from localhost ([::1]:46353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euKwL-0002tZ-RT for importer@patchew.org; Fri, 09 Mar 2018 11:32:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33616) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1euKl1-00018C-9K for qemu-devel@nongnu.org; Fri, 09 Mar 2018 11:20:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1euKkx-0006w4-Uk for qemu-devel@nongnu.org; Fri, 09 Mar 2018 11:20:35 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43174 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1euKko-0006gB-0r; Fri, 09 Mar 2018 11:20:22 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9AC944023112; Fri, 9 Mar 2018 16:20:21 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-234.ams2.redhat.com [10.36.117.234]) by smtp.corp.redhat.com (Postfix) with ESMTP id EA74D215CDAA; Fri, 9 Mar 2018 16:20:20 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 9 Mar 2018 17:18:56 +0100 Message-Id: <20180309161933.8168-20-kwolf@redhat.com> In-Reply-To: <20180309161933.8168-1-kwolf@redhat.com> References: <20180309161933.8168-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 09 Mar 2018 16:20:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Fri, 09 Mar 2018 16:20:21 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 19/56] qcow2: Pass BlockdevCreateOptions to qcow2_co_create() 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, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" All of the simple options are now passed to qcow2_co_create() in a BlockdevCreateOptions object. Still missing: node-name and the encryption options. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: Eric Blake --- block/qcow2.c | 189 ++++++++++++++++++++++++++++++++++++++++++++++--------= ---- 1 file changed, 151 insertions(+), 38 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 7a11874d22..7679c28f57 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2700,19 +2700,26 @@ static int64_t qcow2_calc_prealloc_size(int64_t tot= al_size, return meta_size + aligned_total_size; } =20 -static size_t qcow2_opt_get_cluster_size_del(QemuOpts *opts, Error **errp) +static bool validate_cluster_size(size_t cluster_size, Error **errp) { - size_t cluster_size; - int cluster_bits; - - cluster_size =3D qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE, - DEFAULT_CLUSTER_SIZE); - cluster_bits =3D ctz32(cluster_size); + int cluster_bits =3D ctz32(cluster_size); if (cluster_bits < MIN_CLUSTER_BITS || cluster_bits > MAX_CLUSTER_BITS= || (1 << cluster_bits) !=3D cluster_size) { error_setg(errp, "Cluster size must be a power of two between %d a= nd " "%dk", 1 << MIN_CLUSTER_BITS, 1 << (MAX_CLUSTER_BITS - = 10)); + return false; + } + return true; +} + +static size_t qcow2_opt_get_cluster_size_del(QemuOpts *opts, Error **errp) +{ + size_t cluster_size; + + cluster_size =3D qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE, + DEFAULT_CLUSTER_SIZE); + if (!validate_cluster_size(cluster_size, errp)) { return 0; } return cluster_size; @@ -2761,12 +2768,10 @@ static uint64_t qcow2_opt_get_refcount_bits_del(Qem= uOpts *opts, int version, } =20 static int coroutine_fn -qcow2_co_create(BlockDriverState *bs, int64_t total_size, - const char *backing_file, const char *backing_format, - int flags, size_t cluster_size, PreallocMode prealloc, - QemuOpts *opts, int version, int refcount_order, - const char *encryptfmt, Error **errp) +qcow2_co_create(BlockDriverState *bs, BlockdevCreateOptions *create_option= s, + QemuOpts *opts, const char *encryptfmt, Error **errp) { + BlockdevCreateOptionsQcow2 *qcow2_opts; QDict *options; =20 /* @@ -2783,10 +2788,92 @@ qcow2_co_create(BlockDriverState *bs, int64_t total= _size, */ BlockBackend *blk; QCowHeader *header; + size_t cluster_size; + int version; + int refcount_order; uint64_t* refcount_table; Error *local_err =3D NULL; int ret; =20 + /* Validate options and set default values */ + assert(create_options->driver =3D=3D BLOCKDEV_DRIVER_QCOW2); + qcow2_opts =3D &create_options->u.qcow2; + + if (!QEMU_IS_ALIGNED(qcow2_opts->size, BDRV_SECTOR_SIZE)) { + error_setg(errp, "Image size must be a multiple of 512 bytes"); + ret =3D -EINVAL; + goto out; + } + + if (qcow2_opts->has_version) { + switch (qcow2_opts->version) { + case BLOCKDEV_QCOW2_VERSION_V2: + version =3D 2; + break; + case BLOCKDEV_QCOW2_VERSION_V3: + version =3D 3; + break; + default: + g_assert_not_reached(); + } + } else { + version =3D 3; + } + + if (qcow2_opts->has_cluster_size) { + cluster_size =3D qcow2_opts->cluster_size; + } else { + cluster_size =3D DEFAULT_CLUSTER_SIZE; + } + + if (!validate_cluster_size(cluster_size, errp)) { + return -EINVAL; + } + + if (!qcow2_opts->has_preallocation) { + qcow2_opts->preallocation =3D PREALLOC_MODE_OFF; + } + if (qcow2_opts->has_backing_file && + qcow2_opts->preallocation !=3D PREALLOC_MODE_OFF) + { + error_setg(errp, "Backing file and preallocation cannot be used at= " + "the same time"); + return -EINVAL; + } + if (qcow2_opts->has_backing_fmt && !qcow2_opts->has_backing_file) { + error_setg(errp, "Backing format cannot be used without backing fi= le"); + return -EINVAL; + } + + if (!qcow2_opts->has_lazy_refcounts) { + qcow2_opts->lazy_refcounts =3D false; + } + if (version < 3 && qcow2_opts->lazy_refcounts) { + error_setg(errp, "Lazy refcounts only supported with compatibility= " + "level 1.1 and above (use compat=3D1.1 or greater)"); + return -EINVAL; + } + + if (!qcow2_opts->has_refcount_bits) { + qcow2_opts->refcount_bits =3D 16; + } + if (qcow2_opts->refcount_bits > 64 || + !is_power_of_2(qcow2_opts->refcount_bits)) + { + error_setg(errp, "Refcount width must be a power of two and may no= t " + "exceed 64 bits"); + return -EINVAL; + } + if (version < 3 && qcow2_opts->refcount_bits !=3D 16) { + error_setg(errp, "Different refcount widths than 16 bits require " + "compatibility level 1.1 or above (use compat=3D1.1 or " + "greater)"); + return -EINVAL; + } + refcount_order =3D ctz32(qcow2_opts->refcount_bits); + + + /* Create BlockBackend to write to the image */ blk =3D blk_new(BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL); ret =3D blk_insert_bs(blk, bs, errp); if (ret < 0) { @@ -2813,7 +2900,7 @@ qcow2_co_create(BlockDriverState *bs, int64_t total_s= ize, /* We'll update this to correct value later */ header->crypt_method =3D cpu_to_be32(QCOW_CRYPT_NONE); =20 - if (flags & BLOCK_FLAG_LAZY_REFCOUNTS) { + if (qcow2_opts->lazy_refcounts) { header->compatible_features |=3D cpu_to_be64(QCOW2_COMPAT_LAZY_REFCOUNTS); } @@ -2875,18 +2962,26 @@ qcow2_co_create(BlockDriverState *bs, int64_t total= _size, } =20 /* Okay, now that we have a valid image, let's give it the right size = */ - ret =3D blk_truncate(blk, total_size, PREALLOC_MODE_OFF, errp); + ret =3D blk_truncate(blk, qcow2_opts->size, PREALLOC_MODE_OFF, errp); if (ret < 0) { error_prepend(errp, "Could not resize image: "); goto out; } =20 /* Want a backing file? There you go.*/ - if (backing_file) { - ret =3D bdrv_change_backing_file(blk_bs(blk), backing_file, backin= g_format); + if (qcow2_opts->has_backing_file) { + const char *backing_format =3D NULL; + + if (qcow2_opts->has_backing_fmt) { + backing_format =3D BlockdevDriver_str(qcow2_opts->backing_fmt); + } + + ret =3D bdrv_change_backing_file(blk_bs(blk), qcow2_opts->backing_= file, + backing_format); if (ret < 0) { error_setg_errno(errp, -ret, "Could not assign backing file '%= s' " - "with format '%s'", backing_file, backing_for= mat); + "with format '%s'", qcow2_opts->backing_file, + backing_format); goto out; } } @@ -2900,8 +2995,8 @@ qcow2_co_create(BlockDriverState *bs, int64_t total_s= ize, } =20 /* And if we're supposed to preallocate metadata, do that now */ - if (prealloc !=3D PREALLOC_MODE_OFF) { - ret =3D preallocate(blk_bs(blk), 0, total_size); + if (qcow2_opts->preallocation !=3D PREALLOC_MODE_OFF) { + ret =3D preallocate(blk_bs(blk), 0, qcow2_opts->size); if (ret < 0) { error_setg_errno(errp, -ret, "Could not preallocate metadata"); goto out; @@ -2940,8 +3035,10 @@ out: static int coroutine_fn qcow2_co_create_opts(const char *filename, QemuOpt= s *opts, Error **errp) { + BlockdevCreateOptions create_options; char *backing_file =3D NULL; char *backing_fmt =3D NULL; + BlockdevDriver backing_drv; char *buf =3D NULL; uint64_t size =3D 0; int flags =3D 0; @@ -2949,7 +3046,6 @@ static int coroutine_fn qcow2_co_create_opts(const ch= ar *filename, QemuOpts *opt PreallocMode prealloc; int version; uint64_t refcount_bits; - int refcount_order; char *encryptfmt =3D NULL; BlockDriverState *bs =3D NULL; Error *local_err =3D NULL; @@ -2960,6 +3056,13 @@ static int coroutine_fn qcow2_co_create_opts(const c= har *filename, QemuOpts *opt BDRV_SECTOR_SIZE); backing_file =3D qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FILE); backing_fmt =3D qemu_opt_get_del(opts, BLOCK_OPT_BACKING_FMT); + backing_drv =3D qapi_enum_parse(&BlockdevDriver_lookup, backing_fmt, + 0, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + goto finish; + } encryptfmt =3D qemu_opt_get_del(opts, BLOCK_OPT_ENCRYPT_FORMAT); if (encryptfmt) { if (qemu_opt_get(opts, BLOCK_OPT_ENCRYPT)) { @@ -2997,20 +3100,6 @@ static int coroutine_fn qcow2_co_create_opts(const c= har *filename, QemuOpts *opt flags |=3D BLOCK_FLAG_LAZY_REFCOUNTS; } =20 - if (backing_file && prealloc !=3D PREALLOC_MODE_OFF) { - error_setg(errp, "Backing file and preallocation cannot be used at= " - "the same time"); - ret =3D -EINVAL; - goto finish; - } - - if (version < 3 && (flags & BLOCK_FLAG_LAZY_REFCOUNTS)) { - error_setg(errp, "Lazy refcounts only supported with compatibility= " - "level 1.1 and above (use compat=3D1.1 or greater)"); - ret =3D -EINVAL; - goto finish; - } - refcount_bits =3D qcow2_opt_get_refcount_bits_del(opts, version, &loca= l_err); if (local_err) { error_propagate(errp, local_err); @@ -3018,10 +3107,10 @@ static int coroutine_fn qcow2_co_create_opts(const = char *filename, QemuOpts *opt goto finish; } =20 - refcount_order =3D ctz32(refcount_bits); =20 /* Create and open the file (protocol layer) */ if (prealloc =3D=3D PREALLOC_MODE_FULL || prealloc =3D=3D PREALLOC_MOD= E_FALLOC) { + int refcount_order =3D ctz32(refcount_bits); int64_t prealloc_size =3D qcow2_calc_prealloc_size(size, cluster_size, refcount_order); qemu_opt_set_number(opts, BLOCK_OPT_SIZE, prealloc_size, &error_ab= ort); @@ -3042,9 +3131,33 @@ static int coroutine_fn qcow2_co_create_opts(const c= har *filename, QemuOpts *opt } =20 /* Create the qcow2 image (format layer) */ - ret =3D qcow2_co_create(bs, size, backing_file, backing_fmt, flags, - cluster_size, prealloc, opts, version, refcount_= order, - encryptfmt, errp); + create_options =3D (BlockdevCreateOptions) { + .driver =3D BLOCKDEV_DRIVER_QCOW2, + .u.qcow2 =3D { + .file =3D &(BlockdevRef) { + .type =3D QTYPE_QSTRING, + .u.reference =3D bs->node_name, + }, + .size =3D size, + .has_version =3D true, + .version =3D version =3D=3D 2 + ? BLOCKDEV_QCOW2_VERSION_V2 + : BLOCKDEV_QCOW2_VERSION_V3, + .has_backing_file =3D (backing_file !=3D NULL), + .backing_file =3D backing_file, + .has_backing_fmt =3D (backing_fmt !=3D NULL), + .backing_fmt =3D backing_drv, + .has_cluster_size =3D true, + .cluster_size =3D cluster_size, + .has_preallocation =3D true, + .preallocation =3D prealloc, + .has_lazy_refcounts =3D true, + .lazy_refcounts =3D (flags & BLOCK_FLAG_LAZY_REFCOUNTS), + .has_refcount_bits =3D true, + .refcount_bits =3D refcount_bits, + }, + }; + ret =3D qcow2_co_create(bs, &create_options, opts, encryptfmt, errp); if (ret < 0) { goto finish; } --=20 2.13.6