Re: [PATCH v8 05/14] block/amend: refactor qcow2 amend options

[Max Reitz]

On 08.06.20 11:40, Maxim Levitsky wrote:
> Some qcow2 create options can't be used for amend.
> Remove them from the qcow2 create options and add generic logic to detect
> such options in qemu-img
> 
> Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

Last week (when I was about to prepare a pull request), I noticed that
this patch breaks the iotests 134 and 158 for qcow (v1).  That’s because
as of this patch, qcow2 has a different order of creation options than qcow.

We could easily fix this by moving HEAD^:134.out and HEAD^:158.out to
134.out.qcow and 158.out.qcow, respectively, and HEAD:134.out and
HEAD:158.out to 134.out.qcow2 and 158.out.qcow2, respectively.

But the underlying problem is a greater one: The order of creation
options isn’t fixed between different formats, so I think
_filter_img_create should sort it so it’s the same for all.

To do so, I just sent the “iotests: Make _filter_img_create more active”
series.  We could put that underneath your series and then the problem
would be fixed, too (and we could drop some of the hunks from this
patch, because the option order wouldn’t change for any test that uses
_filter_img_create).

Max

signature.asc
Description: OpenPGP digital signature