Re: [Qemu-block] [PATCH] block: implement the bdrv_reopen_prepare helper for LUKS driver

[Daniel P . Berrangé]

Ping, can this be queued in the block tree, since it appears the no-op impl
is ok ?

On Thu, Jan 18, 2018 at 10:31:43AM +0000, Daniel P. Berrange wrote:
> If the bdrv_reopen_prepare helper isn't provided, the qemu-img commit
> command fails to re-open the base layer after committing changes into
> it. Provide a no-op implementation for the LUKS driver, since there
> is not any custom work that needs doing to re-open it.
> 
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
>  block/crypto.c | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/block/crypto.c b/block/crypto.c
> index 60ddf8623e..bb9a8f5376 100644
> --- a/block/crypto.c
> +++ b/block/crypto.c
> @@ -382,6 +382,12 @@ static void block_crypto_close(BlockDriverState *bs)
>      qcrypto_block_free(crypto->block);
>  }
>  
> +static int block_crypto_reopen_prepare(BDRVReopenState *state,
> +                                       BlockReopenQueue *queue, Error **errp)
> +{
> +    /* nothing needs checking */
> +    return 0;
> +}
>  
>  /*
>   * 1 MB bounce buffer gives good performance / memory tradeoff
> @@ -620,6 +626,7 @@ BlockDriver bdrv_crypto_luks = {
>      .bdrv_truncate      = block_crypto_truncate,
>      .create_opts        = &block_crypto_create_opts_luks,
>  
> +    .bdrv_reopen_prepare = block_crypto_reopen_prepare,
>      .bdrv_refresh_limits = block_crypto_refresh_limits,
>      .bdrv_co_preadv     = block_crypto_co_preadv,
>      .bdrv_co_pwritev    = block_crypto_co_pwritev,
> -- 
> 2.14.3
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|