From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=FROM_EXCESS_BASE64, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BF496C43331 for ; Fri, 6 Sep 2019 14:16:32 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 94C0E2082C for ; Fri, 6 Sep 2019 14:16:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 94C0E2082C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i6F2N-0002jI-AW for qemu-devel@archiver.kernel.org; Fri, 06 Sep 2019 10:16:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49151) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i6ExR-0000H0-Fn for qemu-devel@nongnu.org; Fri, 06 Sep 2019 10:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i6ExP-0000T9-Fr for qemu-devel@nongnu.org; Fri, 06 Sep 2019 10:11:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41182) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i6ExK-0000O8-Hm; Fri, 06 Sep 2019 10:11:19 -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 EC9F285A03; Fri, 6 Sep 2019 14:11:16 +0000 (UTC) Received: from redhat.com (ovpn-112-50.ams2.redhat.com [10.36.112.50]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 50F1D60167; Fri, 6 Sep 2019 14:10:57 +0000 (UTC) Date: Fri, 6 Sep 2019 15:10:54 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Maxim Levitsky Message-ID: <20190906141054.GP5119@redhat.com> References: <20190830205608.18192-1-mlevitsk@redhat.com> <20190830205608.18192-9-mlevitsk@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20190830205608.18192-9-mlevitsk@redhat.com> User-Agent: Mutt/1.12.1 (2019-06-15) 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.26]); Fri, 06 Sep 2019 14:11:17 +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: Re: [Qemu-devel] [PATCH 08/10] block/crypto: implement blockdev-amend X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: Kevin Wolf , qemu-block@nongnu.org, Markus Armbruster , qemu-devel@nongnu.org, Max Reitz , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Aug 30, 2019 at 11:56:06PM +0300, Maxim Levitsky wrote: > Signed-off-by: Maxim Levitsky > --- > block/crypto.c | 86 +++++++++++++++++++++++++++++++++----------- > qapi/block-core.json | 4 +-- > 2 files changed, 68 insertions(+), 22 deletions(-) Reviewed-by: Daniel P. Berrang=C3=A9 > static int > block_crypto_amend_options(BlockDriverState *bs, > QemuOpts *opts, > @@ -678,44 +722,45 @@ block_crypto_amend_options(BlockDriverState *bs, > BlockCrypto *crypto =3D bs->opaque; > QDict *cryptoopts =3D NULL; > QCryptoBlockCreateOptions *amend_options =3D NULL; > - int ret; > + int ret=3D -EINVAL; nitpick - space before '=3D' > =20 > assert(crypto); > assert(crypto->block); > =20 > - crypto->updating_keys =3D true; > - > - ret =3D bdrv_child_refresh_perms(bs, bs->file, errp); > - if (ret) { > - goto cleanup; > - } > - > cryptoopts =3D qemu_opts_to_qdict_filtered(opts, NULL, > &block_crypto_create_opts= _luks, > true); > =20 > qdict_put_str(cryptoopts, "format", "luks"); > amend_options =3D block_crypto_create_opts_init(cryptoopts, errp); > + > if (!amend_options) { > - ret =3D -EINVAL; > - goto cleanup; > + goto out; > } > =20 > - ret =3D qcrypto_block_amend_options(crypto->block, > - block_crypto_read_func, > - block_crypto_write_func, > - bs, > - amend_options, > - force, > - errp); > -cleanup: > - crypto->updating_keys =3D false; > - bdrv_child_refresh_perms(bs, bs->file, errp); > + ret =3D block_crypto_amend_options_generic(bs, amend_options, forc= e, errp); > +out: No need to rename the "cleanup" label to "out" > qapi_free_QCryptoBlockCreateOptions(amend_options); > qobject_unref(cryptoopts); > return ret; > } > =20 > +static int > +coroutine_fn block_crypto_co_amend(BlockDriverState *bs, > + BlockdevCreateOptions *opts, > + bool force, > + Error **errp) > +{ > + QCryptoBlockCreateOptions amend_opts; > + > + amend_opts =3D (QCryptoBlockCreateOptions) { > + .format =3D Q_CRYPTO_BLOCK_FORMAT_LUKS, > + .u.luks =3D *qapi_BlockdevCreateOptionsLUKS_base(&opts->u.luks= ), > + }; > + > + return block_crypto_amend_options_generic(bs, &amend_opts, force, = errp); > +} > + > =20 > static void > block_crypto_child_perms(BlockDriverState *bs, BdrvChild *c, > @@ -774,6 +819,7 @@ static BlockDriver bdrv_crypto_luks =3D { > .bdrv_get_info =3D block_crypto_get_info_luks, > .bdrv_get_specific_info =3D block_crypto_get_specific_info_luks, > .bdrv_amend_options =3D block_crypto_amend_options, > + .bdrv_co_amend =3D block_crypto_co_amend, > =20 > .strong_runtime_opts =3D block_crypto_strong_runtime_opts, > }; > diff --git a/qapi/block-core.json b/qapi/block-core.json > index 7900914506..02375fb59a 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -4220,8 +4220,8 @@ > ## > { 'struct': 'BlockdevCreateOptionsLUKS', > 'base': 'QCryptoBlockCreateOptionsLUKS', > - 'data': { 'file': 'BlockdevRef', > - 'size': 'size', > + 'data': { '*file': 'BlockdevRef', > + '*size': 'size', Docs comment to explain they are mandatory for create=20 > '*preallocation': 'PreallocMode' } } > =20 > ## > --=20 > 2.17.2 >=20 Regards, Daniel --=20 |: https://berrange.com -o- https://www.flickr.com/photos/dberran= ge :| |: https://libvirt.org -o- https://fstop138.berrange.c= om :| |: https://entangle-photo.org -o- https://www.instagram.com/dberran= ge :|