summaryrefslogtreecommitdiffstats
path: root/tests/qemu-iotests/061.out
diff options
context:
space:
mode:
authorMaxim Levitsky2020-06-25 14:55:40 +0200
committerMax Reitz2020-07-06 08:49:28 +0200
commit0b6786a9c1539c9bdacee71e09534e0bf972d865 (patch)
tree198863b5cc2f9aba3aa6ab275d9d73eecf6f9879 /tests/qemu-iotests/061.out
parentblock/amend: separate amend and create options for qemu-img (diff)
downloadqemu-0b6786a9c1539c9bdacee71e09534e0bf972d865.tar.gz
qemu-0b6786a9c1539c9bdacee71e09534e0bf972d865.tar.xz
qemu-0b6786a9c1539c9bdacee71e09534e0bf972d865.zip
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>
Diffstat (limited to 'tests/qemu-iotests/061.out')
-rw-r--r--tests/qemu-iotests/061.out12
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/qemu-iotests/061.out b/tests/qemu-iotests/061.out
index 2f03cf045c..b0f8befe30 100644
--- a/tests/qemu-iotests/061.out
+++ b/tests/qemu-iotests/061.out
@@ -381,16 +381,20 @@ qemu-img: Lazy refcounts only supported with compatibility level 1.1 and above (
qemu-img: Lazy refcounts only supported with compatibility level 1.1 and above (use compat=1.1 or greater)
qemu-img: Unknown compatibility level 0.42
qemu-img: Invalid parameter 'foo'
-qemu-img: Changing the cluster size is not supported
-qemu-img: Changing the encryption flag is not supported
-qemu-img: Cannot change preallocation mode
+qemu-img: Invalid parameter 'cluster_size'
+This option is only supported for image creation
+qemu-img: Invalid parameter 'encryption'
+This option is only supported for image creation
+qemu-img: Invalid parameter 'preallocation'
+This option is only supported for image creation
=== Testing correct handling of unset value ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Should work:
Should not work:
-qemu-img: Changing the cluster size is not supported
+qemu-img: Invalid parameter 'cluster_size'
+This option is only supported for image creation
=== Testing zero expansion on inactive clusters ===