summaryrefslogtreecommitdiffstats
path: root/tests/qemu-iotests/189
diff options
context:
space:
mode:
authorJohn Snow2017-07-18 02:34:22 +0200
committerKevin Wolf2017-07-18 15:27:37 +0200
commit6e6e55f5c2e5b520d6506c2716287ba3b5d1bbc8 (patch)
treeed30613055c350d84000cd205b35bd6ffc441054 /tests/qemu-iotests/189
parentblockdev: move BDRV_O_NO_BACKING option forward (diff)
downloadqemu-6e6e55f5c2e5b520d6506c2716287ba3b5d1bbc8.tar.gz
qemu-6e6e55f5c2e5b520d6506c2716287ba3b5d1bbc8.tar.xz
qemu-6e6e55f5c2e5b520d6506c2716287ba3b5d1bbc8.zip
qemu-img: Check for backing image if specified during create
Or, rather, force the open of a backing image if one was specified for creation. Using a similar -unsafe option as rebase, allow qemu-img to ignore the backing file validation if possible. It may not always be possible, as in the existing case when a filesize for the new image was not specified. This is accomplished by shifting around the conditionals in bdrv_img_create, such that a backing file is always opened unless we provide BDRV_O_NO_BACKING. qemu-img is adjusted to pass this new flag when -u is provided to create. Sorry for the heinous looking diffstat, but it's mostly whitespace. Inspired by: https://bugzilla.redhat.com/show_bug.cgi?id=1213786 Signed-off-by: John Snow <jsnow@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/189')
-rwxr-xr-xtests/qemu-iotests/1892
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/qemu-iotests/189 b/tests/qemu-iotests/189
index 54ad980a4e..e695475722 100755
--- a/tests/qemu-iotests/189
+++ b/tests/qemu-iotests/189
@@ -66,7 +66,7 @@ echo "== verify pattern =="
$QEMU_IO --object $SECRET0 -c "read -P 0xa 0 $size" --image-opts $IMGSPECBASE | _filter_qemu_io | _filter_testdir
echo "== create overlay =="
-_make_test_img --object $SECRET1 -o "encrypt.format=luks,encrypt.key-secret=sec1,encrypt.iter-time=10" -b "$TEST_IMG_BASE" $size
+_make_test_img --object $SECRET1 -o "encrypt.format=luks,encrypt.key-secret=sec1,encrypt.iter-time=10" -u -b "$TEST_IMG_BASE" $size
echo
echo "== writing part of a cluster =="