diff options
| author | Eric Blake <eblake@redhat.com> | 2020-07-06 15:39:46 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2020-07-14 15:18:59 +0200 |
| commit | 25956af3fe5dd0385ad8017bc768a6afe41e2a74 (patch) | |
| tree | 3a8457c7cfddb8bc20179df2f7faeaf460ca8491 /tests | |
| parent | 4e2f4418784da09cb106264340241856cd2846df (diff) | |
| download | qemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.zip qemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.tar.gz qemu-25956af3fe5dd0385ad8017bc768a6afe41e2a74.tar.bz2 | |
block: Finish deprecation of 'qemu-img convert -n -o'
It's been two releases since we started warning; time to make the
combination an error as promised. There was no iotest coverage, so
add some.
While touching the documentation, tweak another section heading for
consistent style.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200706203954.341758-3-eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/122 | 7 | ||||
| -rw-r--r-- | tests/qemu-iotests/122.out | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122 index f7a3ae6..2dc16b2 100755 --- a/tests/qemu-iotests/122 +++ b/tests/qemu-iotests/122 @@ -290,6 +290,13 @@ TEST_IMG="$TEST_IMG".orig _make_test_img 64M # backing file" $QEMU_IMG convert -O $IMGFMT -B "$TEST_IMG".base -n "$TEST_IMG" "$TEST_IMG".orig +echo +echo '=== -n incompatible with -o ===' +echo + +$QEMU_IMG convert -O $IMGFMT -o preallocation=metadata -n \ + "$TEST_IMG" "$TEST_IMG".orig && echo "unexpected success" + # success, all done echo '*** done' rm -f $seq.full diff --git a/tests/qemu-iotests/122.out b/tests/qemu-iotests/122.out index 1a35951..c2e154a 100644 --- a/tests/qemu-iotests/122.out +++ b/tests/qemu-iotests/122.out @@ -233,4 +233,8 @@ Images are identical. Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=67108864 Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=67108864 + +=== -n incompatible with -o === + +qemu-img: -o has no effect when skipping image creation *** done |