]> git.proxmox.com Git - mirror_qemu.git/commit
block/amend: refactor qcow2 amend options
authorMaxim Levitsky <mlevitsk@redhat.com>
Thu, 25 Jun 2020 12:55:40 +0000 (14:55 +0200)
committerMax Reitz <mreitz@redhat.com>
Mon, 6 Jul 2020 06:49:28 +0000 (08:49 +0200)
commit0b6786a9c1539c9bdacee71e09534e0bf972d865
tree198863b5cc2f9aba3aa6ab275d9d73eecf6f9879
parentdf373fb0a3a26c2b1b92d27c91bea22a0f5b598d
block/amend: refactor qcow2 amend options

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>
[mreitz: Dropped some iotests reference output hunks that became
         unnecessary thanks to
         "iotests: Make _filter_img_create more active"]
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200625125548.870061-12-mreitz@redhat.com>
12 files changed:
block/qcow2.c
qemu-img.c
tests/qemu-iotests/049.out
tests/qemu-iotests/061.out
tests/qemu-iotests/082.out
tests/qemu-iotests/085.out
tests/qemu-iotests/144.out
tests/qemu-iotests/182.out
tests/qemu-iotests/185.out
tests/qemu-iotests/255.out
tests/qemu-iotests/274.out
tests/qemu-iotests/280.out