Re: [PATCH 11/13] block/crypto: implement blockdev-amend

[Maxim Levitsky]

On Tue, 2020-01-28 at 17:40 +0000, Daniel P. Berrangé wrote:
> On Tue, Jan 14, 2020 at 09:33:48PM +0200, Maxim Levitsky wrote:
> > Signed-off-by: Maxim Levitsky <address@hidden>
> > ---
> >  block/crypto.c       | 70 ++++++++++++++++++++++++++++++++------------
> >  qapi/block-core.json | 14 ++++++++-
> >  2 files changed, 64 insertions(+), 20 deletions(-)
> > 
> > diff --git a/block/crypto.c b/block/crypto.c
> > index 081880bced..6836337863 100644
> > --- a/block/crypto.c
> > +++ b/block/crypto.c
> 
> 
> >  
> > +static int
> > +coroutine_fn block_crypto_co_amend(BlockDriverState *bs,
> > +                                   BlockdevAmendOptions *opts,
> > +                                   bool force,
> > +                                   Error **errp)
> 
> This should have a _luks suffix given...

100% agree. Fixed now.

> > +{
> > +    QCryptoBlockAmendOptions amend_opts;
> > +
> > +    amend_opts = (QCryptoBlockAmendOptions) {
> > +        .format = Q_CRYPTO_BLOCK_FORMAT_LUKS,
> > +        .u.luks = *qapi_BlockdevAmendOptionsLUKS_base(&opts->u.luks),
> 
> ...this is hardcoded to luks
> 
> > +    };
> > +    return block_crypto_amend_options_generic(bs, &amend_opts, force, 
> > errp);
> > +}
> >  
> >  static void
> >  block_crypto_child_perms(BlockDriverState *bs, BdrvChild *c,
> > @@ -812,6 +843,7 @@ static BlockDriver bdrv_crypto_luks = {
> >      .bdrv_get_info      = block_crypto_get_info_luks,
> >      .bdrv_get_specific_info = block_crypto_get_specific_info_luks,
> >      .bdrv_amend_options = block_crypto_amend_options,
> > +    .bdrv_co_amend      = block_crypto_co_amend,
> >  
> >      .strong_runtime_opts = block_crypto_strong_runtime_opts,
> >  };
> 
> Reviewed-by: Daniel P. Berrangé <address@hidden>

Thanks for the review,
        Best regards,
                Maxim Levitsky
> 
> 
> 
> Regards,
> Daniel