On Sun, Mar 08, 2020 at 05:18:54PM +0200, 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 <[email protected]> > --- > block/qcow2.c | 108 ++++++--------------- > qemu-img.c | 18 +++- > tests/qemu-iotests/049.out | 102 ++++++++++---------- > tests/qemu-iotests/061.out | 12 ++- > tests/qemu-iotests/079.out | 18 ++-- > tests/qemu-iotests/082.out | 149 ++++------------------------ > tests/qemu-iotests/085.out | 38 ++++---- > tests/qemu-iotests/087.out | 6 +- > tests/qemu-iotests/115.out | 2 +- > tests/qemu-iotests/121.out | 4 +- > tests/qemu-iotests/125.out | 192 ++++++++++++++++++------------------- > tests/qemu-iotests/134.out | 2 +- > tests/qemu-iotests/144.out | 4 +- > tests/qemu-iotests/158.out | 4 +- > tests/qemu-iotests/182.out | 2 +- > tests/qemu-iotests/185.out | 8 +- > tests/qemu-iotests/188.out | 2 +- > tests/qemu-iotests/189.out | 4 +- > tests/qemu-iotests/198.out | 4 +- > tests/qemu-iotests/243.out | 16 ++-- > tests/qemu-iotests/250.out | 2 +- > tests/qemu-iotests/255.out | 8 +- > tests/qemu-iotests/263.out | 4 +- > tests/qemu-iotests/280.out | 2 +- > 24 files changed, 283 insertions(+), 428 deletions(-)
Kind of annoying how the option order changes, but that's not a functional problem and there's no easy way to avoid it. Perhaps the original code should have alphabetically ordered them but that's not your problem to solve really. Reviewed-by: Daniel P. Berrangé <[email protected]> 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 :|
