On Thu, 2020-05-14 at 16:30 +0200, Max Reitz wrote:
> 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 <[email protected]>
> > Reviewed-by: Daniel P. Berrangé <[email protected]>
> > ---
> > block/qcow2.c | 72 +++++++++++++++++++++++++++++++++-----
> > tests/qemu-iotests/082.out | 45 ++++++++++++++++++++++++
>
> Again, some rebasing required because of compression_type.
Actually for this particular test, the output didn't change,
because the compression_type is not amendable (at least yet).
>
> > 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?
No reason. Fixed!
>
> With this line dropped, and 082.out fixed up:
>
> Reviewed-by: Max Reitz <[email protected]>
>
Thank you very much!
Best regards,
Maxim Levitsky