From nobody Wed Apr 16 03:55:38 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499792659667309.2183693249201; Tue, 11 Jul 2017 10:04:19 -0700 (PDT) Received: from localhost ([::1]:47634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUya5-0008PR-6X for importer@patchew.org; Tue, 11 Jul 2017 13:04:13 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dUxm2-0001mw-JD for qemu-devel@nongnu.org; Tue, 11 Jul 2017 12:12:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dUxlu-00072C-MW for qemu-devel@nongnu.org; Tue, 11 Jul 2017 12:12:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37228) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dUxlo-00070U-Rx; Tue, 11 Jul 2017 12:12:17 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E95E483F45; Tue, 11 Jul 2017 16:12:15 +0000 (UTC) Received: from localhost (ovpn-204-123.brq.redhat.com [10.40.204.123]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F2DA6F925; Tue, 11 Jul 2017 16:12:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E95E483F45 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mreitz@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E95E483F45 From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 11 Jul 2017 18:07:54 +0200 Message-Id: <20170711160814.20941-66-mreitz@redhat.com> In-Reply-To: <20170711160814.20941-1-mreitz@redhat.com> References: <20170711160814.20941-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 11 Jul 2017 16:12:16 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 65/85] qcow2: extract image creation option parsing 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: qemu-devel@nongnu.org, Max Reitz 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" From: Stefan Hajnoczi The image creation options parsed by qcow2_create() are also needed to implement .bdrv_measure(). Extract the parsing code, including input validation. Signed-off-by: Stefan Hajnoczi Reviewed-by: Alberto Garcia Message-id: 20170705125738.8777-6-stefanha@redhat.com Signed-off-by: Max Reitz --- block/qcow2.c | 109 +++++++++++++++++++++++++++++++++++++++---------------= ---- 1 file changed, 73 insertions(+), 36 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index eb57013..db8d81f 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2612,25 +2612,74 @@ static int64_t qcow2_calc_prealloc_size(int64_t tot= al_size, return meta_size + aligned_total_size; } =20 -static int qcow2_create2(const char *filename, int64_t total_size, - const char *backing_file, const char *backing_for= mat, - int flags, size_t cluster_size, PreallocMode prea= lloc, - QemuOpts *opts, int version, int refcount_order, - const char *encryptfmt, Error **errp) +static size_t qcow2_opt_get_cluster_size_del(QemuOpts *opts, Error **errp) { + size_t cluster_size; int cluster_bits; - QDict *options; =20 - /* Calculate cluster_bits */ + cluster_size =3D qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE, + DEFAULT_CLUSTER_SIZE); 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 -EINVAL; + return 0; + } + return cluster_size; +} + +static int qcow2_opt_get_version_del(QemuOpts *opts, Error **errp) +{ + char *buf; + int ret; + + buf =3D qemu_opt_get_del(opts, BLOCK_OPT_COMPAT_LEVEL); + if (!buf) { + ret =3D 3; /* default */ + } else if (!strcmp(buf, "0.10")) { + ret =3D 2; + } else if (!strcmp(buf, "1.1")) { + ret =3D 3; + } else { + error_setg(errp, "Invalid compatibility level: '%s'", buf); + ret =3D -EINVAL; + } + g_free(buf); + return ret; +} + +static uint64_t qcow2_opt_get_refcount_bits_del(QemuOpts *opts, int versio= n, + Error **errp) +{ + uint64_t refcount_bits; + + refcount_bits =3D qemu_opt_get_number_del(opts, BLOCK_OPT_REFCOUNT_BIT= S, 16); + if (refcount_bits > 64 || !is_power_of_2(refcount_bits)) { + error_setg(errp, "Refcount width must be a power of two and may no= t " + "exceed 64 bits"); + return 0; + } + + if (version < 3 && 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 0; } =20 + return refcount_bits; +} + +static int qcow2_create2(const char *filename, int64_t total_size, + const char *backing_file, const char *backing_for= mat, + int flags, size_t cluster_size, PreallocMode prea= lloc, + QemuOpts *opts, int version, int refcount_order, + const char *encryptfmt, Error **errp) +{ + QDict *options; + /* * Open the image file and write a minimal qcow2 header. * @@ -2679,7 +2728,7 @@ static int qcow2_create2(const char *filename, int64_= t total_size, *header =3D (QCowHeader) { .magic =3D cpu_to_be32(QCOW_MAGIC), .version =3D cpu_to_be32(version), - .cluster_bits =3D cpu_to_be32(cluster_bits), + .cluster_bits =3D cpu_to_be32(ctz32(cluster_size)), .size =3D cpu_to_be64(0), .l1_table_offset =3D cpu_to_be64(0), .l1_size =3D cpu_to_be32(0), @@ -2826,8 +2875,8 @@ static int qcow2_create(const char *filename, QemuOpt= s *opts, Error **errp) int flags =3D 0; size_t cluster_size =3D DEFAULT_CLUSTER_SIZE; PreallocMode prealloc; - int version =3D 3; - uint64_t refcount_bits =3D 16; + int version; + uint64_t refcount_bits; int refcount_order; const char *encryptfmt =3D NULL; Error *local_err =3D NULL; @@ -2849,8 +2898,12 @@ static int qcow2_create(const char *filename, QemuOp= ts *opts, Error **errp) } else if (qemu_opt_get_bool_del(opts, BLOCK_OPT_ENCRYPT, false)) { encryptfmt =3D "aes"; } - cluster_size =3D qemu_opt_get_size_del(opts, BLOCK_OPT_CLUSTER_SIZE, - DEFAULT_CLUSTER_SIZE); + cluster_size =3D qcow2_opt_get_cluster_size_del(opts, &local_err); + if (local_err) { + error_propagate(errp, local_err); + ret =3D -EINVAL; + goto finish; + } buf =3D qemu_opt_get_del(opts, BLOCK_OPT_PREALLOC); prealloc =3D qapi_enum_parse(PreallocMode_lookup, buf, PREALLOC_MODE__MAX, PREALLOC_MODE_OFF, @@ -2860,16 +2913,10 @@ static int qcow2_create(const char *filename, QemuO= pts *opts, Error **errp) ret =3D -EINVAL; goto finish; } - g_free(buf); - buf =3D qemu_opt_get_del(opts, BLOCK_OPT_COMPAT_LEVEL); - if (!buf) { - /* keep the default */ - } else if (!strcmp(buf, "0.10")) { - version =3D 2; - } else if (!strcmp(buf, "1.1")) { - version =3D 3; - } else { - error_setg(errp, "Invalid compatibility level: '%s'", buf); + + version =3D qcow2_opt_get_version_del(opts, &local_err); + if (local_err) { + error_propagate(errp, local_err); ret =3D -EINVAL; goto finish; } @@ -2892,19 +2939,9 @@ static int qcow2_create(const char *filename, QemuOp= ts *opts, Error **errp) goto finish; } =20 - refcount_bits =3D qemu_opt_get_number_del(opts, BLOCK_OPT_REFCOUNT_BIT= S, - refcount_bits); - if (refcount_bits > 64 || !is_power_of_2(refcount_bits)) { - error_setg(errp, "Refcount width must be a power of two and may no= t " - "exceed 64 bits"); - ret =3D -EINVAL; - goto finish; - } - - if (version < 3 && 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)"); + refcount_bits =3D qcow2_opt_get_refcount_bits_del(opts, version, &loca= l_err); + if (local_err) { + error_propagate(errp, local_err); ret =3D -EINVAL; goto finish; } --=20 2.9.4