On Tue, 2019-10-15 at 16:27 +0200, Max Reitz wrote: > Overwriting IMGOPTS means ignoring all user-supplied options, which is > not what we want. Replace the current IMGOPTS use by a new BACKING_FILE > variable. > > Signed-off-by: Max Reitz <mre...@redhat.com> > --- > tests/qemu-iotests/267 | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267 > index d37a67c012..eda45449d4 100755 > --- a/tests/qemu-iotests/267 > +++ b/tests/qemu-iotests/267 > @@ -68,7 +68,11 @@ size=128M > > run_test() > { > - _make_test_img $size > + if [ -n "$BACKING_FILE" ]; then > + _make_test_img -b "$BACKING_FILE" $size > + else > + _make_test_img $size > + fi > printf "savevm snap0\ninfo snapshots\nloadvm snap0\n" | run_qemu "$@" | > _filter_date > } > > @@ -119,12 +123,12 @@ echo > > TEST_IMG="$TEST_IMG.base" _make_test_img $size > > -IMGOPTS="backing_file=$TEST_IMG.base" \ > +BACKING_FILE="$TEST_IMG.base" \ > run_test -blockdev > driver=file,filename="$TEST_IMG.base",node-name=backing-file \ > -blockdev driver=file,filename="$TEST_IMG",node-name=file \ > -blockdev > driver=$IMGFMT,file=file,backing=backing-file,node-name=fmt > > -IMGOPTS="backing_file=$TEST_IMG.base" \ > +BACKING_FILE="$TEST_IMG.base" \ > run_test -blockdev > driver=file,filename="$TEST_IMG.base",node-name=backing-file \ > -blockdev driver=$IMGFMT,file=backing-file,node-name=backing-fmt \ > -blockdev driver=file,filename="$TEST_IMG",node-name=file \ > @@ -141,7 +145,7 @@ echo > echo "=== -blockdev with NBD server on the backing file ===" > echo > > -IMGOPTS="backing_file=$TEST_IMG.base" _make_test_img $size > +_make_test_img -b "$TEST_IMG.base" $size > cat <<EOF | > nbd_server_start unix:$TEST_DIR/nbd > nbd_server_add -w backing-fmt
Reviewed-by: Maxim Levitsky <mlevi...@redhat.com> Best regards, Maxim Levitsky