Re: [PATCH v6 08/14] block/qcow2: extend qemu-img amend interface with crypto options

[Max Reitz]

On 10.05.20 15:40, Maxim Levitsky wrote:
> Now that we have all the infrastructure in place,
> wire it in the qcow2 driver and expose this to the user.
> 
> Signed-off-by: Maxim Levitsky <mlevi...@redhat.com>
> Reviewed-by: Daniel P. Berrangé <berra...@redhat.com>
> ---
>  block/qcow2.c              | 72 +++++++++++++++++++++++++++++++++-----
>  tests/qemu-iotests/082.out | 45 ++++++++++++++++++++++++

Again, some rebasing required because of compression_type.

>  2 files changed, 108 insertions(+), 9 deletions(-)
> 
> diff --git a/block/qcow2.c b/block/qcow2.c
> index db86500839..4bb6e3fc8f 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c

[...]

> @@ -4744,17 +4757,11 @@ static BlockMeasureInfo *qcow2_measure(QemuOpts 
> *opts, BlockDriverState *in_bs,
>      g_free(optstr);
>  
>      if (has_luks) {
> +

Why?

With this line dropped, and 082.out fixed up:

Reviewed-by: Max Reitz <mre...@redhat.com>

signature.asc
Description: OpenPGP digital signature