Commit: 21c1ce592a144188dfe59b9e156a97da412a59a2 - qemu (git)

Commit MetaInfo

• Revision: 21c1ce592a144188dfe59b9e156a97da412a59a2 (tree)
• Time: 2019-06-14 22:09:42
• Author: Max Reitz <mreitz@redh...>
• Commiter: Max Reitz

Log Message

iotests: Test qemu-img convert -C --salvage

We do not support this combination (yet), so this should yield an error
message.

Signed-off-by: Max Reitz <[e-mail]>
Tested-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Reviewed-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Message-id: [e-mail]
Signed-off-by: Max Reitz <[e-mail]>

Change Summary

• modified: tests/qemu-iotests/082
• modified: tests/qemu-iotests/082.out

Incremental Difference

--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082
@@ -162,6 +162,7 @@ echo === convert: -C and other options ===
 run_qemu_img convert -C -S 4k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
 run_qemu_img convert -C -S 8k -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
 run_qemu_img convert -C -c -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
+run_qemu_img convert -C --salvage -O $IMGFMT "$TEST_IMG" "$TEST_IMG".target
 
 echo
 echo === amend: Options specified more than once ===

--- a/tests/qemu-iotests/082.out
+++ b/tests/qemu-iotests/082.out
@@ -567,6 +567,9 @@ qemu-img: Cannot enable copy offloading when -S is used
 Testing: convert -C -c -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target
 qemu-img: Cannot enable copy offloading when -c is used
 
+Testing: convert -C --salvage -O qcow2 TEST_DIR/t.qcow2 TEST_DIR/t.qcow2.target
+qemu-img: Cannot use copy offloading in salvaging mode
+
 === amend: Options specified more than once ===
 
 Testing: amend -f foo -f qcow2 -o lazy_refcounts=on TEST_DIR/t.qcow2