From nobody Fri Oct 24 09:38:26 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 1519414301166452.7103055981735; Fri, 23 Feb 2018 11:31:41 -0800 (PST) Received: from localhost ([::1]:46714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epJ4G-0004w9-Au for importer@patchew.org; Fri, 23 Feb 2018 14:31:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epIz0-0000ZZ-6A for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epIyy-00048j-Uf for qemu-devel@nongnu.org; Fri, 23 Feb 2018 14:26:14 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43868 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 1epIyv-00042I-Uz; Fri, 23 Feb 2018 14:26:10 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 843B08182D06; Fri, 23 Feb 2018 19:26:09 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-118.ams2.redhat.com [10.36.117.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id E84392024CC3; Fri, 23 Feb 2018 19:26:07 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 23 Feb 2018 20:25:19 +0100 Message-Id: <20180223192549.26666-7-kwolf@redhat.com> In-Reply-To: <20180223192549.26666-1-kwolf@redhat.com> References: <20180223192549.26666-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 23 Feb 2018 19:26:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 23 Feb 2018 19:26:09 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.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] [PATCH v3 06/36] qcow2: Use QCryptoBlockCreateOptions in qcow2_create2() 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, jdurgin@redhat.com, pkrempa@redhat.com, mitake.hitoshi@lab.ntt.co.jp, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, namei.unix@gmail.com 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" Instead of passing the encryption format name and the QemuOpts down, use the QCryptoBlockCreateOptions contained in BlockdevCreateOptions. Signed-off-by: Kevin Wolf Reviewed-by: Eric Blake Reviewed-by: Max Reitz --- block/qcow2.c | 62 +++++++++++++++++++++++++++++++++++++++++++------------= ---- 1 file changed, 45 insertions(+), 17 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index b34924b0f0..9a2028b3cf 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2414,13 +2414,10 @@ static int qcow2_crypt_method_from_format(const cha= r *encryptfmt) } } =20 -static int qcow2_set_up_encryption(BlockDriverState *bs, const char *encry= ptfmt, - QemuOpts *opts, Error **errp) +static QCryptoBlockCreateOptions * +qcow2_parse_encryption(const char *encryptfmt, QemuOpts *opts, Error **err= p) { - BDRVQcow2State *s =3D bs->opaque; QCryptoBlockCreateOptions *cryptoopts =3D NULL; - QCryptoBlock *crypto =3D NULL; - int ret =3D -EINVAL; QDict *options, *encryptopts; int fmt; =20 @@ -2443,10 +2440,31 @@ static int qcow2_set_up_encryption(BlockDriverState= *bs, const char *encryptfmt, error_setg(errp, "Unknown encryption format '%s'", encryptfmt); break; } - if (!cryptoopts) { - ret =3D -EINVAL; - goto out; + + QDECREF(encryptopts); + return cryptoopts; +} + +static int qcow2_set_up_encryption(BlockDriverState *bs, + QCryptoBlockCreateOptions *cryptoopts, + Error **errp) +{ + BDRVQcow2State *s =3D bs->opaque; + QCryptoBlock *crypto =3D NULL; + int fmt, ret; + + switch (cryptoopts->format) { + case Q_CRYPTO_BLOCK_FORMAT_LUKS: + fmt =3D QCOW_CRYPT_LUKS; + break; + case Q_CRYPTO_BLOCK_FORMAT_QCOW: + fmt =3D QCOW_CRYPT_AES; + break; + default: + error_setg(errp, "Crypto format not supported in qcow2"); + return -EINVAL; } + s->crypt_method_header =3D fmt; =20 crypto =3D qcrypto_block_create(cryptoopts, "encrypt.", @@ -2454,8 +2472,7 @@ static int qcow2_set_up_encryption(BlockDriverState *= bs, const char *encryptfmt, qcow2_crypto_hdr_write_func, bs, errp); if (!crypto) { - ret =3D -EINVAL; - goto out; + return -EINVAL; } =20 ret =3D qcow2_update_header(bs); @@ -2464,10 +2481,9 @@ static int qcow2_set_up_encryption(BlockDriverState = *bs, const char *encryptfmt, goto out; } =20 + ret =3D 0; out: - QDECREF(encryptopts); qcrypto_block_free(crypto); - qapi_free_QCryptoBlockCreateOptions(cryptoopts); return ret; } =20 @@ -2732,8 +2748,7 @@ static uint64_t qcow2_opt_get_refcount_bits_del(QemuO= pts *opts, int version, return refcount_bits; } =20 -static int qcow2_create2(BlockdevCreateOptions *create_options, - QemuOpts *opts, const char *encryptfmt, Error **e= rrp) +static int qcow2_create2(BlockdevCreateOptions *create_options, Error **er= rp) { BlockdevCreateOptionsQcow2 *qcow2_opts; QDict *options; @@ -2963,8 +2978,8 @@ static int qcow2_create2(BlockdevCreateOptions *creat= e_options, } =20 /* Want encryption? There you go. */ - if (encryptfmt) { - ret =3D qcow2_set_up_encryption(blk_bs(blk), encryptfmt, opts, err= p); + if (qcow2_opts->has_encrypt) { + ret =3D qcow2_set_up_encryption(blk_bs(blk), qcow2_opts->encrypt, = errp); if (ret < 0) { goto out; } @@ -3021,6 +3036,7 @@ static int qcow2_create(const char *filename, QemuOpt= s *opts, Error **errp) int version; uint64_t refcount_bits; char *encryptfmt =3D NULL; + QCryptoBlockCreateOptions *cryptoopts =3D NULL; BlockDriverState *bs =3D NULL; Error *local_err =3D NULL; int ret; @@ -3037,6 +3053,7 @@ static int qcow2_create(const char *filename, QemuOpt= s *opts, Error **errp) 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)) { @@ -3048,6 +3065,14 @@ 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 g_strdup("aes"); } + if (encryptfmt) { + cryptoopts =3D qcow2_parse_encryption(encryptfmt, opts, errp); + if (cryptoopts =3D=3D NULL) { + ret =3D -EINVAL; + goto finish; + } + } + cluster_size =3D qcow2_opt_get_cluster_size_del(opts, &local_err); if (local_err) { error_propagate(errp, local_err); @@ -3121,6 +3146,8 @@ static int qcow2_create(const char *filename, QemuOpt= s *opts, Error **errp) .backing_file =3D backing_file, .has_backing_fmt =3D (backing_fmt !=3D NULL), .backing_fmt =3D backing_drv, + .has_encrypt =3D (encryptfmt !=3D NULL), + .encrypt =3D cryptoopts, .has_cluster_size =3D true, .cluster_size =3D cluster_size, .has_preallocation =3D true, @@ -3131,7 +3158,7 @@ static int qcow2_create(const char *filename, QemuOpt= s *opts, Error **errp) .refcount_bits =3D refcount_bits, }, }; - ret =3D qcow2_create2(&create_options, opts, encryptfmt, errp); + ret =3D qcow2_create2(&create_options, errp); if (ret < 0) { goto finish; } @@ -3139,6 +3166,7 @@ static int qcow2_create(const char *filename, QemuOpt= s *opts, Error **errp) finish: bdrv_unref(bs); =20 + qapi_free_QCryptoBlockCreateOptions(cryptoopts); g_free(backing_file); g_free(backing_fmt); g_free(encryptfmt); --=20 2.13.6