* [PATCH 00/18] iotests: Allow ./check -o data_file
@ 2019-09-27 9:42 Max Reitz
2019-09-27 9:42 ` [PATCH 01/18] iotests: Filter refcount_order in 036 Max Reitz
` (17 more replies)
0 siblings, 18 replies; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
Hi,
It’s my understanding that we want better test coverage for qcow2’s
external data files. I think the natural thing to do is to let all
tests create images with external data files.
We already have the -o option for ./check for additional image options
(and I regularly use it for recount_bits=1 and compat=0.10).
Unfortunately, we cannot use it directly for data_file, because of
course every test image needs its own data file. What I think we want
is a pattern: Something like -o 'data_file=$TEST_IMG.data_file', and
then “$TEST_IMG” is replaced by the qcow2 image name.
This is done by the final patch in this series. There is a lot of
preparatory work to be done, though.
(1) Some tests overwrite IMGOPTS. This will make them ignore
user-specified options. That was always a problem (that means those
tests ignored my pleas for refcount_bits=1 and compat=0.10) but
someone needs to fix this at some point, and I guess that’s me right
now.
So we need to stop tests from overwriting IMGOPTS. This is done by
patches 1 through 9.
In addition, patch 10 fixes other cases where user-specified options
are ignored (because some tests use qemu-img create directly instead
of _make_test_img).
(2) Some tests access image files directly. This can only work for
images without external data files. There are two subcases:
(A) rm: Fixed by patch 11
(B) cp/mv: Fixed by patch 12
(3) Some tests are broken with data_file, but we can fix it. Done by
patches 13 through 16.
(4) Some tests are broken with data_file, and I don’t think we can fix
it. So patch 17 adds _unsupported_imgopts data_file for them.
(5) And then there’s patch 18, which does what we really want.
Future work:
- Python tests currently completely ignore IMGOPTS. Preexisting
problem, needs to be addressed in another series, but for the moment
it at least means they won’t break if you run the tests with
data_file.
- data_file_raw=on needs to be addressed in another series. I suspect
this will mainly consist of making it unsupported in all tests that
use backing files.
Max Reitz (18):
iotests: Filter refcount_order in 036
iotests: Replace IMGOPTS by _unsupported_imgopts
iotests: Drop compat=1.1 in 050
iotests: Let _make_test_img parse its parameters
iotests: Add -o and --no-opts to _make_test_img
iotests: Inject space into -ocompat=0.10 in 051
iotests: Replace IMGOPTS= by -o
iotests: Replace IMGOPTS='' by --no-opts
iotests: Drop IMGOPTS use in 267
iotests: Avoid qemu-img create
iotests: Use _rm_test_img for deleting test images
iotests: Avoid cp/mv of test images
iotests: Make 091 work with data_file
iotests: Make 110 work with data_file
iotests: Make 137 work with data_file
iotests: Make 198 work with data_file
iotests: Disable data_file where it cannot be used
iotests: Allow check -o data_file
tests/qemu-iotests/005 | 2 +-
tests/qemu-iotests/007 | 5 +--
tests/qemu-iotests/014 | 2 ++
tests/qemu-iotests/015 | 5 +--
tests/qemu-iotests/019 | 6 ++--
tests/qemu-iotests/020 | 6 ++--
tests/qemu-iotests/024 | 10 +++---
tests/qemu-iotests/026 | 5 ++-
tests/qemu-iotests/028 | 2 +-
tests/qemu-iotests/029 | 7 ++--
tests/qemu-iotests/031 | 9 +++--
tests/qemu-iotests/036 | 15 ++++----
tests/qemu-iotests/036.out | 6 ++--
tests/qemu-iotests/039 | 27 ++++++--------
tests/qemu-iotests/043 | 4 ++-
tests/qemu-iotests/046 | 2 ++
tests/qemu-iotests/048 | 4 ++-
tests/qemu-iotests/050 | 8 ++---
tests/qemu-iotests/051 | 7 ++--
tests/qemu-iotests/053 | 4 +--
tests/qemu-iotests/058 | 7 ++--
tests/qemu-iotests/059 | 20 +++++------
tests/qemu-iotests/060 | 12 ++++---
tests/qemu-iotests/061 | 61 +++++++++++++++++---------------
tests/qemu-iotests/062 | 3 +-
tests/qemu-iotests/063 | 18 +++++-----
tests/qemu-iotests/063.out | 3 +-
tests/qemu-iotests/066 | 3 +-
tests/qemu-iotests/067 | 6 ++--
tests/qemu-iotests/068 | 4 ++-
tests/qemu-iotests/069 | 2 +-
tests/qemu-iotests/071 | 7 ++--
tests/qemu-iotests/073 | 2 ++
tests/qemu-iotests/074 | 4 ++-
tests/qemu-iotests/079 | 3 +-
tests/qemu-iotests/080 | 7 ++--
tests/qemu-iotests/081 | 6 ++--
tests/qemu-iotests/085 | 18 +++++-----
tests/qemu-iotests/085.out | 8 ++---
tests/qemu-iotests/088 | 2 +-
tests/qemu-iotests/090 | 2 ++
tests/qemu-iotests/091 | 3 +-
tests/qemu-iotests/091.out | 1 -
tests/qemu-iotests/092 | 2 +-
tests/qemu-iotests/094 | 4 +--
tests/qemu-iotests/095 | 5 +--
tests/qemu-iotests/098 | 5 +--
tests/qemu-iotests/099 | 10 +++---
tests/qemu-iotests/103 | 5 +--
tests/qemu-iotests/106 | 2 +-
tests/qemu-iotests/108 | 8 +++--
tests/qemu-iotests/109 | 4 +--
tests/qemu-iotests/110 | 11 +++---
tests/qemu-iotests/110.out | 4 +--
tests/qemu-iotests/111 | 3 +-
tests/qemu-iotests/112 | 37 +++++++++----------
tests/qemu-iotests/114 | 2 ++
tests/qemu-iotests/115 | 3 +-
tests/qemu-iotests/121 | 9 +++--
tests/qemu-iotests/122 | 6 ++--
tests/qemu-iotests/123 | 4 +--
tests/qemu-iotests/125 | 2 +-
tests/qemu-iotests/137 | 12 ++++---
tests/qemu-iotests/137.out | 4 +--
tests/qemu-iotests/138 | 5 +--
tests/qemu-iotests/141 | 4 ++-
tests/qemu-iotests/142 | 2 +-
tests/qemu-iotests/144 | 4 ++-
tests/qemu-iotests/153 | 12 +++----
tests/qemu-iotests/156 | 10 ++++--
tests/qemu-iotests/159 | 2 +-
tests/qemu-iotests/160 | 3 +-
tests/qemu-iotests/161 | 4 +--
tests/qemu-iotests/170 | 2 +-
tests/qemu-iotests/172 | 6 ++--
tests/qemu-iotests/173 | 3 +-
tests/qemu-iotests/174 | 2 +-
tests/qemu-iotests/175 | 2 +-
tests/qemu-iotests/176 | 7 ++--
tests/qemu-iotests/178 | 6 ++--
tests/qemu-iotests/182 | 2 +-
tests/qemu-iotests/183 | 2 +-
tests/qemu-iotests/185 | 4 +--
tests/qemu-iotests/187 | 6 ++--
tests/qemu-iotests/190 | 4 +--
tests/qemu-iotests/191 | 11 +++---
tests/qemu-iotests/195 | 2 +-
tests/qemu-iotests/197 | 6 ++--
tests/qemu-iotests/198 | 6 ++--
tests/qemu-iotests/198.out | 4 +--
tests/qemu-iotests/200 | 7 ++--
tests/qemu-iotests/201 | 6 ++--
tests/qemu-iotests/214 | 3 +-
tests/qemu-iotests/215 | 6 ++--
tests/qemu-iotests/217 | 3 +-
tests/qemu-iotests/220 | 5 ++-
tests/qemu-iotests/225 | 2 +-
tests/qemu-iotests/229 | 3 +-
tests/qemu-iotests/232 | 4 ++-
tests/qemu-iotests/243 | 10 ++++--
tests/qemu-iotests/244 | 15 ++++----
tests/qemu-iotests/247 | 4 ++-
tests/qemu-iotests/249 | 4 +--
tests/qemu-iotests/250 | 5 +--
tests/qemu-iotests/252 | 2 +-
tests/qemu-iotests/265 | 2 +-
tests/qemu-iotests/267 | 17 +++++----
tests/qemu-iotests/common.filter | 21 +++++++++--
tests/qemu-iotests/common.rc | 51 +++++++++++++++++++++-----
109 files changed, 455 insertions(+), 316 deletions(-)
--
2.21.0
^ permalink raw reply [flat|nested] 60+ messages in thread
* [PATCH 01/18] iotests: Filter refcount_order in 036
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:31 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
` (16 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
This test can run just fine with other values for refcount_bits, so we
should filter the value from qcow2.py's dump-header.
(036 currently ignores user-specified image options, but that will be
fixed in the next patch.)
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/036 | 9 ++++++---
tests/qemu-iotests/036.out | 6 +++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index f06ff67408..69d0f9f903 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
# Without feature table
$PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header \
+ | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
_img_info
# With feature table containing bit 63
@@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
echo
_make_test_img 64M
$PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header \
+ | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
echo
echo === Repair image ===
echo
_check_test_img -r all
-$PYTHON qcow2.py "$TEST_IMG" dump-header
+$PYTHON qcow2.py "$TEST_IMG" dump-header \
+ | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
# success, all done
echo "*** done"
diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
index e489b44386..998c2a8a35 100644
--- a/tests/qemu-iotests/036.out
+++ b/tests/qemu-iotests/036.out
@@ -19,7 +19,7 @@ snapshot_offset 0x0
incompatible_features 0x8000000000000000
compatible_features 0x0
autoclear_features 0x0
-refcount_order 4
+refcount_order (filtered)
header_length 104
qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
@@ -53,7 +53,7 @@ snapshot_offset 0x0
incompatible_features 0x0
compatible_features 0x0
autoclear_features 0x8000000000000000
-refcount_order 4
+refcount_order (filtered)
header_length 104
Header extension:
@@ -81,7 +81,7 @@ snapshot_offset 0x0
incompatible_features 0x0
compatible_features 0x0
autoclear_features 0x0
-refcount_order 4
+refcount_order (filtered)
header_length 104
Header extension:
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
2019-09-27 9:42 ` [PATCH 01/18] iotests: Filter refcount_order in 036 Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:31 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 03/18] iotests: Drop compat=1.1 in 050 Max Reitz
` (15 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
globally. That is not how it should be done; instead, they should
simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
default anyway).
This makes the tests heed user-specified $IMGOPTS. Some do not work
with all image options, though, so we need to disable them accordingly.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/036 | 3 +--
tests/qemu-iotests/060 | 4 ++--
tests/qemu-iotests/062 | 3 ++-
tests/qemu-iotests/066 | 3 ++-
tests/qemu-iotests/068 | 3 ++-
tests/qemu-iotests/098 | 3 +--
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index 69d0f9f903..57dda23b02 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -43,9 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-
# Only qcow2v3 and later supports feature bits
-IMGOPTS="compat=1.1"
+_unsupported_imgopts 'compat=0.10'
echo
echo === Image with unknown incompatible feature bit ===
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index b91d8321bb..9c2ef42522 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -48,6 +48,8 @@ _filter_io_error()
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# These tests only work for compat=1.1 images with refcount_bits=16
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
rt_offset=65536 # 0x10000 (XXX: just an assumption)
rb_offset=131072 # 0x20000 (XXX: just an assumption)
@@ -55,8 +57,6 @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
l2_offset=262144 # 0x40000 (XXX: just an assumption)
l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
-IMGOPTS="compat=1.1"
-
OPEN_RW="open -o overlap-check=all $TEST_IMG"
# Overlap checks are done before write operations only, therefore opening an
# image read-only makes the overlap-check option irrelevant
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index d5f818fcce..ac0d2a9a3b 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
+# We need zero clusters and snapshots
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
-IMGOPTS="compat=1.1"
IMG_SIZE=64M
echo
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index 28f8c98412..9a15ba8027 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -39,9 +39,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
+# Weneed zero clusters and snapshots
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
# Intentionally create an unaligned image
-IMGOPTS="compat=1.1"
IMG_SIZE=$((64 * 1024 * 1024 + 512))
echo
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index 22f5ca3ba6..65650fca9a 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -39,8 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
+# Internal snapshots are (currently) impossible with refcount_bits=1
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
-IMGOPTS="compat=1.1"
IMG_SIZE=128K
case "$QEMU_DEFAULT_MACHINE" in
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index 1c1d1c468f..2d68dc7d6c 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -40,8 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-
-IMGOPTS="compat=1.1"
+_unsupported_imgopts 'compat=0.10'
for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 03/18] iotests: Drop compat=1.1 in 050
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
2019-09-27 9:42 ` [PATCH 01/18] iotests: Filter refcount_order in 036 Max Reitz
2019-09-27 9:42 ` [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 04/18] iotests: Let _make_test_img parse its parameters Max Reitz
` (14 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
IMGOPTS can never be empty for qcow2, because the check scripts adds
compat=1.1 unless the user specified any compat option themselves.
Thus, this block does not do anything and can be dropped.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/050 | 4 ----
1 file changed, 4 deletions(-)
diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index 211fc00797..272ecab195 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -41,10 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file
-if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
- IMGOPTS=compat=1.1
-fi
-
echo
echo "== Creating images =="
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 04/18] iotests: Let _make_test_img parse its parameters
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (2 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 03/18] iotests: Drop compat=1.1 in 050 Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img Max Reitz
` (13 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
This will allow us to add more options than just -b.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++--------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 12b4751848..3e7adc4834 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -282,12 +282,12 @@ _make_test_img()
# extra qemu-img options can be added by tests
# at least one argument (the image size) needs to be added
local extra_img_options=""
- local image_size=$*
local optstr=""
local img_name=""
local use_backing=0
local backing_file=""
local object_options=""
+ local misc_params=()
if [ -n "$TEST_IMG_FILE" ]; then
img_name=$TEST_IMG_FILE
@@ -303,11 +303,23 @@ _make_test_img()
optstr=$(_optstr_add "$optstr" "key-secret=keysec0")
fi
- if [ "$1" = "-b" ]; then
- use_backing=1
- backing_file=$2
- image_size=$3
- fi
+ for param; do
+ if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
+ backing_file=$param
+ continue
+ fi
+
+ case "$param" in
+ -b)
+ use_backing=1
+ ;;
+
+ *)
+ misc_params=("${misc_params[@]}" "$param")
+ ;;
+ esac
+ done
+
if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
fi
@@ -323,9 +335,9 @@ _make_test_img()
# XXX(hch): have global image options?
(
if [ $use_backing = 1 ]; then
- $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" $image_size 2>&1
+ $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" "${misc_params[@]}" 2>&1
else
- $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" $image_size 2>&1
+ $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" "${misc_params[@]}" 2>&1
fi
) | _filter_img_create
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (3 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 04/18] iotests: Let _make_test_img parse its parameters Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
` (12 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
Blindly overriding IMGOPTS is suboptimal as this discards user-specified
options. Whatever options the test needs should simply be appended.
Some tests do this (with IMGOPTS=$(_optstr_add "$IMGOPTS" "...")), but
that is cumbersome. It’s simpler to just give _make_test_img an -o
parameter with which tests can add options.
Some tests actually must override the user-specified options, though,
for example when creating an image in a different format than the test
$IMGFMT. For such cases, --no-opts allows clearing the current option
list.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/common.rc | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 3e7adc4834..f3784077de 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -287,6 +287,7 @@ _make_test_img()
local use_backing=0
local backing_file=""
local object_options=""
+ local opts_param=false
local misc_params=()
if [ -n "$TEST_IMG_FILE" ]; then
@@ -307,6 +308,10 @@ _make_test_img()
if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
backing_file=$param
continue
+ elif $opts_param; then
+ optstr=$(_optstr_add "$optstr" "$param")
+ opts_param=false
+ continue
fi
case "$param" in
@@ -314,6 +319,14 @@ _make_test_img()
use_backing=1
;;
+ -o)
+ opts_param=true
+ ;;
+
+ --no-opts)
+ optstr=""
+ ;;
+
*)
misc_params=("${misc_params[@]}" "$param")
;;
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (4 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 07/18] iotests: Replace IMGOPTS= by -o Max Reitz
` (11 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
It did not matter before, but now that _make_test_img understands -o, we
should use it properly here.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/051 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 53bcdbc911..9cd1d60d45 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -157,7 +157,7 @@ echo
echo === With version 2 images enabling lazy refcounts must fail ===
echo
-_make_test_img -ocompat=0.10 $size
+_make_test_img -o compat=0.10 $size
run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=on
run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=off
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 07/18] iotests: Replace IMGOPTS= by -o
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (5 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
` (10 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
Tests should not overwrite all user-supplied image options, but only add
to it (which will effectively overwrite conflicting values). Accomplish
this by passing options to _make_test_img via -o instead of $IMGOPTS.
For some tests, there is no functional change because they already only
appended options to IMGOPTS. For these, this patch is just a
simplification.
For others, this is a change, so they now heed user-specified $IMGOPTS.
Some of those tests do not work with all image options, though, so we
need to disable them accordingly.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/031 | 9 ++++---
tests/qemu-iotests/039 | 24 ++++++------------
tests/qemu-iotests/059 | 18 ++++++-------
tests/qemu-iotests/060 | 6 ++---
tests/qemu-iotests/061 | 57 ++++++++++++++++++++++--------------------
tests/qemu-iotests/079 | 3 +--
tests/qemu-iotests/106 | 2 +-
tests/qemu-iotests/108 | 2 +-
tests/qemu-iotests/112 | 32 ++++++++++++------------
tests/qemu-iotests/115 | 3 +--
tests/qemu-iotests/121 | 6 ++---
tests/qemu-iotests/125 | 2 +-
tests/qemu-iotests/137 | 2 +-
tests/qemu-iotests/138 | 3 +--
tests/qemu-iotests/175 | 2 +-
tests/qemu-iotests/190 | 2 +-
tests/qemu-iotests/191 | 3 +--
tests/qemu-iotests/220 | 4 ++-
tests/qemu-iotests/243 | 6 +++--
tests/qemu-iotests/244 | 10 +++++---
tests/qemu-iotests/250 | 3 +--
tests/qemu-iotests/265 | 2 +-
22 files changed, 100 insertions(+), 101 deletions(-)
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index a3c25ec237..c44fcf91bb 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -40,19 +40,22 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
+# We want to test compat=0.10, which does not support refcount widths
+# other than 16
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
CLUSTER_SIZE=65536
# qcow2.py output depends on the exact options used, so override the command
# line here as an exception
-for IMGOPTS in "compat=0.10" "compat=1.1"; do
+for compat in "compat=0.10" "compat=1.1"; do
echo
- echo ===== Testing with -o $IMGOPTS =====
+ echo ===== Testing with -o $compat =====
echo
echo === Create image with unknown header extension ===
echo
- _make_test_img 64M
+ _make_test_img -o $compat 64M
$PYTHON qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test header extension"
$PYTHON qcow2.py "$TEST_IMG" dump-header
_check_test_img
diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index 325da63a4c..99563bf126 100755
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@@ -50,8 +50,7 @@ size=128M
echo
echo "== Checking that image is clean on shutdown =="
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
$QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
@@ -62,8 +61,7 @@ _check_test_img
echo
echo "== Creating a dirty image file =="
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
_NO_VALGRIND \
$QEMU_IO -c "write -P 0x5a 0 512" \
@@ -98,8 +96,7 @@ $QEMU_IO -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
echo
echo "== Opening a dirty image read/write should repair it =="
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
_NO_VALGRIND \
$QEMU_IO -c "write -P 0x5a 0 512" \
@@ -117,8 +114,7 @@ $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
echo
echo "== Creating an image file with lazy_refcounts=off =="
-IMGOPTS="compat=1.1,lazy_refcounts=off"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
_NO_VALGRIND \
$QEMU_IO -c "write -P 0x5a 0 512" \
@@ -132,11 +128,9 @@ _check_test_img
echo
echo "== Committing to a backing file with lazy_refcounts=on =="
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-TEST_IMG="$TEST_IMG".base _make_test_img $size
+TEST_IMG="$TEST_IMG".base _make_test_img -o "compat=1.1,lazy_refcounts=on" $size
-IMGOPTS="compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base" $size
$QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG commit "$TEST_IMG"
@@ -151,8 +145,7 @@ TEST_IMG="$TEST_IMG".base _check_test_img
echo
echo "== Changing lazy_refcounts setting at runtime =="
-IMGOPTS="compat=1.1,lazy_refcounts=off"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
_NO_VALGRIND \
$QEMU_IO -c "reopen -o lazy-refcounts=on" \
@@ -164,8 +157,7 @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \
$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
_check_test_img
-IMGOPTS="compat=1.1,lazy_refcounts=on"
-_make_test_img $size
+_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
_NO_VALGRIND \
$QEMU_IO -c "reopen -o lazy-refcounts=off" \
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index 10bfbaecec..3941c3f0c2 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -70,18 +70,18 @@ poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
echo
echo "=== Testing monolithicFlat creation and opening ==="
-IMGOPTS="subformat=monolithicFlat" _make_test_img 2G
+_make_test_img -o "subformat=monolithicFlat" 2G
_img_info
_cleanup_test_img
echo
echo "=== Testing monolithicFlat with zeroed_grain ==="
-IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G
+_make_test_img -o "subformat=monolithicFlat,zeroed_grain=on" 2G
_cleanup_test_img
echo
echo "=== Testing big twoGbMaxExtentFlat ==="
-IMGOPTS="subformat=twoGbMaxExtentFlat" _make_test_img 1000G
+_make_test_img -o "subformat=twoGbMaxExtentFlat" 1000G
$QEMU_IMG info $TEST_IMG | _filter_testdir | sed -e 's/cid: [0-9]*/cid: XXXXXXXX/'
_cleanup_test_img
@@ -101,13 +101,13 @@ _img_info
echo
echo "=== Testing truncated sparse ==="
-IMGOPTS="subformat=monolithicSparse" _make_test_img 100G
+_make_test_img -o "subformat=monolithicSparse" 100G
truncate -s 10M $TEST_IMG
_img_info
echo
echo "=== Converting to streamOptimized from image with small cluster size==="
-TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 IMGOPTS="cluster_size=4096" _make_test_img 1G
+TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 _make_test_img -o "cluster_size=4096" 1G
$QEMU_IO -f qcow2 -c "write -P 0xa 0 512" "$TEST_IMG.qcow2" | _filter_qemu_io
$QEMU_IO -f qcow2 -c "write -P 0xb 10240 512" "$TEST_IMG.qcow2" | _filter_qemu_io
$QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2" "$TEST_IMG" 2>&1
@@ -117,7 +117,7 @@ echo "=== Testing monolithicFlat with internally generated JSON file name ==="
echo '--- blkdebug ---'
# Should work, because bdrv_dirname() works fine with blkdebug
-IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+_make_test_img -o "subformat=monolithicFlat" 64M
$QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
-c info \
2>&1 \
@@ -126,7 +126,7 @@ _cleanup_test_img
echo '--- quorum ---'
# Should not work, because bdrv_dirname() does not work with quorum
-IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
+_make_test_img -o "subformat=monolithicFlat" 64M
cp "$TEST_IMG" "$TEST_IMG.orig"
filename="json:{
@@ -161,7 +161,7 @@ _cleanup_test_img
echo
echo "=== Testing 4TB monolithicFlat creation and IO ==="
-IMGOPTS="subformat=monolithicFlat" _make_test_img 4T
+_make_test_img -o "subformat=monolithicFlat" 4T
_img_info
$QEMU_IO -c "write -P 0xa 900G 512" "$TEST_IMG" | _filter_qemu_io
$QEMU_IO -c "read -v 900G 1024" "$TEST_IMG" | _filter_qemu_io
@@ -170,7 +170,7 @@ _cleanup_test_img
echo
echo "=== Testing qemu-img map on extents ==="
for fmt in monolithicSparse twoGbMaxExtentSparse; do
- IMGOPTS="subformat=$fmt" _make_test_img 31G
+ _make_test_img -o "subformat=$fmt" 31G
$QEMU_IO -c "write 65024 1k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IO -c "write 2147483136 1k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IO -c "write 5G 1k" "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index 9c2ef42522..92243c2edd 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -158,7 +158,7 @@ $QEMU_IO -c 'write 0k 64k' "$BACKING_IMG" | _filter_qemu_io
# compat=0.10 is required in order to make the following discard actually
# unallocate the sector rather than make it a zero sector - we want COW, after
# all.
-IMGOPTS='compat=0.10' _make_test_img -b "$BACKING_IMG" 1G
+_make_test_img -o 'compat=0.10' -b "$BACKING_IMG" 1G
# Write two clusters, the second one enforces creation of an L2 table after
# the first data cluster.
$QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_io
@@ -398,7 +398,7 @@ echo
echo "=== Discarding a non-covered in-bounds refblock ==="
echo
-IMGOPTS='refcount_bits=1' _make_test_img 64M
+_make_test_img -o 'refcount_bits=1' 64M
# Pretend there's a refblock somewhere where there is no refblock to
# cover it (but the covering refblock has a valid index in the
@@ -422,7 +422,7 @@ echo
echo "=== Discarding a refblock covered by an unaligned refblock ==="
echo
-IMGOPTS='refcount_bits=1' _make_test_img 64M
+_make_test_img -o 'refcount_bits=1' 64M
# Same as above
poke_file "$TEST_IMG" "$(($rt_offset+8))" "\x00\x00\x00\x10\x00\x00\x00\x00"
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index 4eac5b83bd..0480be0141 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -41,11 +41,14 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# Conversion between different compat versions can only really work
+# with refcount_bits=16
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
echo
echo "=== Testing version downgrade with zero expansion ==="
echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
$QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
$PYTHON qcow2.py "$TEST_IMG" dump-header
$QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -56,7 +59,7 @@ _check_test_img
echo
echo "=== Testing version downgrade with zero expansion and 4K cache entries ==="
echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
$QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IO -c "write -z 32M 128k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io
@@ -72,7 +75,7 @@ _check_test_img
echo
echo "=== Testing dirty version downgrade ==="
echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
_NO_VALGRIND \
$QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
-c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
@@ -85,7 +88,7 @@ _check_test_img
echo
echo "=== Testing version downgrade with unknown compat/autoclear flags ==="
echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
$PYTHON qcow2.py "$TEST_IMG" set-feature-bit compatible 42
$PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 42
$PYTHON qcow2.py "$TEST_IMG" dump-header
@@ -96,7 +99,7 @@ _check_test_img
echo
echo "=== Testing version upgrade and resize ==="
echo
-IMGOPTS="compat=0.10" _make_test_img 64M
+_make_test_img -o "compat=0.10" 64M
$QEMU_IO -c "write -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io
$PYTHON qcow2.py "$TEST_IMG" dump-header
$QEMU_IMG amend -o "compat=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG"
@@ -107,7 +110,7 @@ _check_test_img
echo
echo "=== Testing dirty lazy_refcounts=off ==="
echo
-IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
_NO_VALGRIND \
$QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
-c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
@@ -120,8 +123,8 @@ _check_test_img
echo
echo "=== Testing backing file ==="
echo
-IMGOPTS="compat=1.1" _make_test_img 64M
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
$QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
$QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG amend -o "backing_file=$TEST_IMG.base,backing_fmt=qcow2" "$TEST_IMG"
@@ -131,7 +134,7 @@ _check_test_img
echo
echo "=== Testing invalid configurations ==="
echo
-IMGOPTS="compat=0.10" _make_test_img 64M
+_make_test_img -o "compat=0.10" 64M
$QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
$QEMU_IMG amend -o "compat=1.1" "$TEST_IMG" # actually valid
$QEMU_IMG amend -o "compat=0.10,lazy_refcounts=on" "$TEST_IMG"
@@ -144,7 +147,7 @@ $QEMU_IMG amend -o "preallocation=on" "$TEST_IMG"
echo
echo "=== Testing correct handling of unset value ==="
echo
-IMGOPTS="compat=1.1,cluster_size=1k" _make_test_img 64M
+_make_test_img -o "compat=1.1,cluster_size=1k" 64M
echo "Should work:"
$QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
echo "Should not work:" # Just to know which of these tests actually fails
@@ -153,7 +156,7 @@ $QEMU_IMG amend -o "cluster_size=64k" "$TEST_IMG"
echo
echo "=== Testing zero expansion on inactive clusters ==="
echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
$QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG snapshot -c foo "$TEST_IMG"
$QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io
@@ -167,7 +170,7 @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
echo
echo "=== Testing zero expansion on shared L2 table ==="
echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
$QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG snapshot -c foo "$TEST_IMG"
$QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -180,9 +183,9 @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
echo
echo "=== Testing zero expansion on backed image ==="
echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
$QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
$QEMU_IO -c "read -P 0x2a 0 128k" -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
_check_test_img
@@ -191,9 +194,9 @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
echo
echo "=== Testing zero expansion on backed inactive clusters ==="
echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
$QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
$QEMU_IO -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG snapshot -c foo "$TEST_IMG"
$QEMU_IO -c "write -P 0x42 0 128k" "$TEST_IMG" | _filter_qemu_io
@@ -207,9 +210,9 @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
echo
echo "=== Testing zero expansion on backed image with shared L2 table ==="
echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
$QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
$QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
$QEMU_IMG snapshot -c foo "$TEST_IMG"
$QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
@@ -222,7 +225,7 @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
echo
echo "=== Testing preallocated zero expansion on full image ==="
echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG" _make_test_img 64M
+TEST_IMG="$TEST_IMG" _make_test_img -o "compat=1.1" 64M
$QEMU_IO -c "write -P 0x2a 0 64M" "$TEST_IMG" -c "write -z 0 64M" | _filter_qemu_io
$QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
_check_test_img
@@ -231,8 +234,8 @@ $QEMU_IO -c "read -P 0 0 64M" "$TEST_IMG" | _filter_qemu_io
echo
echo "=== Testing progress report without snapshot ==="
echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
$QEMU_IO -c "write -z 0 64k" \
-c "write -z 1G 64k" \
-c "write -z 2G 64k" \
@@ -243,8 +246,8 @@ _check_test_img
echo
echo "=== Testing progress report with snapshot ==="
echo
-IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
-IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
+TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
+_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
$QEMU_IO -c "write -z 0 64k" \
-c "write -z 1G 64k" \
-c "write -z 2G 64k" \
@@ -256,7 +259,7 @@ _check_test_img
echo
echo "=== Testing version downgrade with external data file ==="
echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
$QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
_img_info --format-specific
_check_test_img
@@ -264,11 +267,11 @@ _check_test_img
echo
echo "=== Try changing the external data file ==="
echo
-IMGOPTS="compat=1.1" _make_test_img 64M
+_make_test_img -o "compat=1.1" 64M
$QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
$QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
_img_info --format-specific
TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info --format-specific --image-opts
@@ -281,7 +284,7 @@ TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info -
echo
echo "=== Clearing and setting data-file-raw ==="
echo
-IMGOPTS="compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
+_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" 64M
$QEMU_IMG amend -o "data_file_raw=on" "$TEST_IMG"
_img_info --format-specific
_check_test_img
diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 81f0c21f53..162355b29a 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -44,8 +44,7 @@ echo
cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304"
for s in $cluster_sizes; do
- IMGOPTS=$(_optstr_add "$IMGOPTS" "preallocation=metadata,cluster_size=$s") \
- _make_test_img 4G
+ _make_test_img -o "preallocation=metadata,cluster_size=$s" 4G
done
# success, all done
diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106
index ac47eaa0f5..b5d1ec4078 100755
--- a/tests/qemu-iotests/106
+++ b/tests/qemu-iotests/106
@@ -51,7 +51,7 @@ for create_mode in off falloc full; do
echo
echo "--- create_mode=$create_mode growth_mode=$growth_mode ---"
- IMGOPTS="preallocation=$create_mode" _make_test_img ${CREATION_SIZE}K
+ _make_test_img -o "preallocation=$create_mode" ${CREATION_SIZE}K
$QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
expected_size=0
diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index 9c08172237..b0a6ae597b 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -65,7 +65,7 @@ echo
echo '=== Repairing unreferenced data cluster in new refblock area ==='
echo
-IMGOPTS='cluster_size=512' _make_test_img 64M
+_make_test_img -o 'cluster_size=512' 64M
# Allocate the first 128 kB in the image (first refblock)
$QEMU_IO -c 'write 0 0x1b200' "$TEST_IMG" | _filter_qemu_io
# should be 131072 == 0x20000
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 706c10b600..6850225939 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -53,20 +53,20 @@ echo '=== refcount_bits limits ==='
echo
# Must be positive (non-zero)
-IMGOPTS="$IMGOPTS,refcount_bits=0" _make_test_img 64M
+_make_test_img -o "refcount_bits=0" 64M
# Must be positive (non-negative)
-IMGOPTS="$IMGOPTS,refcount_bits=-1" _make_test_img 64M
+_make_test_img -o "refcount_bits=-1" 64M
# May not exceed 64
-IMGOPTS="$IMGOPTS,refcount_bits=128" _make_test_img 64M
+_make_test_img -o "refcount_bits=128" 64M
# Must be a power of two
-IMGOPTS="$IMGOPTS,refcount_bits=42" _make_test_img 64M
+_make_test_img -o "refcount_bits=42" 64M
# 1 is the minimum
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
print_refcount_bits
# 64 is the maximum
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
print_refcount_bits
# 16 is the default
@@ -78,19 +78,19 @@ echo '=== refcount_bits and compat=0.10 ==='
echo
# Should work
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=16" _make_test_img 64M
+_make_test_img -o "compat=0.10,refcount_bits=16" 64M
print_refcount_bits
# Should not work
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=1" _make_test_img 64M
-IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "compat=0.10,refcount_bits=1" 64M
+_make_test_img -o "compat=0.10,refcount_bits=64" 64M
echo
echo '=== Snapshot limit on refcount_bits=1 ==='
echo
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
print_refcount_bits
$QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -106,7 +106,7 @@ echo
echo '=== Snapshot limit on refcount_bits=2 ==='
echo
-IMGOPTS="$IMGOPTS,refcount_bits=2" _make_test_img 64M
+_make_test_img -o "refcount_bits=2" 64M
print_refcount_bits
$QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -124,7 +124,7 @@ echo
echo '=== Compressed clusters with refcount_bits=1 ==='
echo
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
print_refcount_bits
# Both should fit into a single host cluster; instead of failing to increase the
@@ -140,7 +140,7 @@ echo
echo '=== MSb set in 64 bit refcount ==='
echo
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
print_refcount_bits
$QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -158,7 +158,7 @@ echo
echo '=== Snapshot on maximum 64 bit refcount value ==='
echo
-IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
+_make_test_img -o "refcount_bits=64" 64M
print_refcount_bits
$QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
@@ -239,7 +239,7 @@ echo
echo '=== Testing too many references for check ==='
echo
-IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
+_make_test_img -o "refcount_bits=1" 64M
print_refcount_bits
# This cluster should be created at 0x50000
@@ -262,7 +262,7 @@ echo
echo '=== Multiple walks necessary during amend ==='
echo
-IMGOPTS="$IMGOPTS,refcount_bits=1,cluster_size=512" _make_test_img 64k
+_make_test_img -o "refcount_bits=1,cluster_size=512" 64k
# Cluster 0 is the image header, clusters 1 to 4 are used by the L1 table, a
# single L2 table, the reftable and a single refblock. This creates 58 data
diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index 9ed3cb6a83..d254b18342 100755
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115
@@ -64,8 +64,7 @@ echo
# least 256 MB. We can achieve that by using preallocation=metadata for an image
# which has a guest disk size of 256 MB.
-IMGOPTS="$IMGOPTS,refcount_bits=64,cluster_size=512,preallocation=metadata" \
- _make_test_img 256M
+_make_test_img -o "refcount_bits=64,cluster_size=512,preallocation=metadata" 256M
# We know for sure that the L1 and refcount tables do not overlap with any other
# structure because the metadata overlap checks would have caught that case.
diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index 90a0424edb..10db813d94 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -50,7 +50,7 @@ echo
# Preallocation speeds up the write operation, but preallocating everything will
# destroy the purpose of the write; so preallocate one KB less than what would
# cause a reftable growth...
-IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64512K
+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64512K
# ...and make the image the desired size afterwards.
$QEMU_IMG resize "$TEST_IMG" 65M
@@ -73,7 +73,7 @@ echo
echo '--- Test 2 ---'
echo
-IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64513K
+_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64513K
# This results in an L1 table growth which in turn results in some clusters at
# the start of the image becoming free
$QEMU_IMG resize "$TEST_IMG" 65M
@@ -96,7 +96,7 @@ echo
echo '=== Allocating a new refcount block must not leave holes in the image ==='
echo
-IMGOPTS='cluster_size=512,refcount_bits=16' _make_test_img 1M
+_make_test_img -o 'cluster_size=512,refcount_bits=16' 1M
# This results in an image with 256 used clusters: the qcow2 header,
# the refcount table, one refcount block, the L1 table, four L2 tables
diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index 4e31aa4e5f..d510984045 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -114,7 +114,7 @@ for GROWTH_SIZE in 16 48 80; do
for growth_mode in off metadata falloc full; do
echo "--- cluster_size=$cluster_size growth_size=$GROWTH_SIZE create_mode=$create_mode growth_mode=$growth_mode ---"
- IMGOPTS="preallocation=$create_mode,cluster_size=$cluster_size" _make_test_img ${CREATION_SIZE}
+ _make_test_img -o "preallocation=$create_mode,cluster_size=$cluster_size" ${CREATION_SIZE}
$QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
host_size_0=$(get_image_size_on_host)
diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index 089821da0c..6cf2997577 100755
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137
@@ -117,7 +117,7 @@ $QEMU_IO \
-c "reopen -o cache-clean-interval=-1" \
"$TEST_IMG" | _filter_qemu_io
-IMGOPTS="cluster_size=256k" _make_test_img 32P
+_make_test_img -o "cluster_size=256k" 32P
$QEMU_IO \
-c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \
"$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index 6a731370db..66ae9d5e78 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -45,8 +45,7 @@ echo
echo '=== Check on an image with a multiple of 2^32 clusters ==='
echo
-IMGOPTS=$(_optstr_add "$IMGOPTS" "cluster_size=512") \
- _make_test_img 512
+_make_test_img -o "cluster_size=512" 512
# Allocate L2 table
$QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
index 55db2803ed..020ed8e61f 100755
--- a/tests/qemu-iotests/175
+++ b/tests/qemu-iotests/175
@@ -95,7 +95,7 @@ stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_block
for mode in off full falloc; do
echo
echo "== creating image with preallocation $mode =="
- IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt
+ _make_test_img -o preallocation=$mode $size | _filter_imgfmt
stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
done
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index eb766ad09f..5890ff9cfc 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -45,7 +45,7 @@ _supported_proto file
echo "== Huge file =="
echo
-IMGOPTS='cluster_size=2M' _make_test_img 2T
+_make_test_img -o 'cluster_size=2M' 2T
$QEMU_IMG measure -O raw -f qcow2 "$TEST_IMG"
$QEMU_IMG measure -O qcow2 -o cluster_size=64k -f qcow2 "$TEST_IMG"
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 528022e8d8..21c16a32cb 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -51,8 +51,7 @@ echo === Preparing and starting VM ===
echo
TEST_IMG="${TEST_IMG}.base" _make_test_img $size
-IMGOPTS=$(_optstr_add "$IMGOPTS" "backing_fmt=$IMGFMT") \
- TEST_IMG="${TEST_IMG}.mid" _make_test_img -b "${TEST_IMG}.base"
+TEST_IMG="${TEST_IMG}.mid" _make_test_img -o "backing_fmt=$IMGFMT" -b "${TEST_IMG}.base"
_make_test_img -b "${TEST_IMG}.mid"
TEST_IMG="${TEST_IMG}.ovl2" _make_test_img -b "${TEST_IMG}.mid"
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index 2d62c5dcac..3769f372cb 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -37,6 +37,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# To use a different refcount width but 16 bits we need compat=1.1
+_unsupported_imgopts 'compat=0.10'
echo "== Creating huge file =="
@@ -46,7 +48,7 @@ if ! truncate --size=513T "$TEST_IMG"; then
_notrun "file system on $TEST_DIR does not support large enough files"
fi
rm "$TEST_IMG"
-IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
+_make_test_img -o 'cluster_size=2M,refcount_bits=1' 513T
echo "== Populating refcounts =="
# We want an image with 256M refcounts * 2M clusters = 512T referenced.
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index e563761307..2b84b896db 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -40,6 +40,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# External data files do not work with compat=0.10
+_unsupported_imgopts 'compat=0.10'
for mode in off metadata falloc full; do
@@ -47,7 +49,7 @@ for mode in off metadata falloc full; do
echo "=== preallocation=$mode ==="
echo
- IMGOPTS="preallocation=$mode" _make_test_img 64M
+ _make_test_img -o "preallocation=$mode" 64M
printf "File size: "
du -b $TEST_IMG | cut -f1
@@ -64,7 +66,7 @@ for mode in off metadata falloc full; do
echo "=== External data file: preallocation=$mode ==="
echo
- IMGOPTS="data_file=$TEST_IMG.data,preallocation=$mode" _make_test_img 64M
+ _make_test_img -o "data_file=$TEST_IMG.data,preallocation=$mode" 64M
echo -n "qcow2 file size: "
du -b $TEST_IMG | cut -f1
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index 13978f93d2..0375bc12d4 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -41,13 +41,15 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# External data files do not work with compat=0.10
+_unsupported_imgopts 'compat=0.10'
echo
echo "=== Create and open image with external data file ==="
echo
echo "With data file name in the image:"
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
_check_test_img
$QEMU_IO -c "open $TEST_IMG" -c "read -P 0 0 64k" 2>&1 | _filter_qemu_io | _filter_testdir
@@ -104,7 +106,7 @@ echo
echo "=== Standalone image with external data file (efficient) ==="
echo
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
echo -n "qcow2 file size before I/O: "
du -b $TEST_IMG | cut -f1
@@ -154,7 +156,7 @@ echo
echo "=== Standalone image with external data file (valid raw) ==="
echo
-IMGOPTS="data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data,data_file_raw=on" 64M
echo -n "qcow2 file size before I/O: "
du -b $TEST_IMG | cut -f1
@@ -187,7 +189,7 @@ echo
echo "=== bdrv_co_block_status test for file and offset=0 ==="
echo
-IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
+_make_test_img -o "data_file=$TEST_IMG.data" 64M
$QEMU_IO -c 'write -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
$QEMU_IO -c 'read -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index c9c0a84a5a..670cf19076 100755
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250
@@ -55,9 +55,8 @@ disk_usage()
}
size=2100M
-IMGOPTS="cluster_size=1M,preallocation=metadata"
-_make_test_img $size
+_make_test_img -o "cluster_size=1M,preallocation=metadata" $size
$QEMU_IO -c 'discard 0 10M' -c 'discard 2090M 10M' \
-c 'write 2090M 10M' -c 'write 0 10M' "$TEST_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265
index dce6f77be3..00f2ec769e 100755
--- a/tests/qemu-iotests/265
+++ b/tests/qemu-iotests/265
@@ -41,7 +41,7 @@ _supported_os Linux
echo '--- Writing to the image ---'
# Reduce cluster size so we get more and quicker I/O
-IMGOPTS='cluster_size=4096' _make_test_img 1M
+_make_test_img -o 'cluster_size=4096' 1M
(for ((kb = 1024 - 4; kb >= 0; kb -= 4)); do \
echo "aio_write -P 42 $((kb + 1))k 2k"; \
done) \
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (6 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 07/18] iotests: Replace IMGOPTS= by -o Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 09/18] iotests: Drop IMGOPTS use in 267 Max Reitz
` (9 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/071 | 4 ++--
tests/qemu-iotests/174 | 2 +-
tests/qemu-iotests/178 | 4 ++--
tests/qemu-iotests/197 | 4 ++--
tests/qemu-iotests/215 | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index fab526666b..4e31943244 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -58,7 +58,7 @@ echo
echo "=== Testing blkverify through filename ==="
echo
-TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
_filter_imgfmt
_make_test_img $IMG_SIZE
$QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \
@@ -73,7 +73,7 @@ echo
echo "=== Testing blkverify through file blockref ==="
echo
-TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
+TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
_filter_imgfmt
_make_test_img $IMG_SIZE
$QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG" \
diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
index 0a952a73fd..e2f14a38c6 100755
--- a/tests/qemu-iotests/174
+++ b/tests/qemu-iotests/174
@@ -40,7 +40,7 @@ _unsupported_fmt raw
size=256K
-IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt
+IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt
echo
echo "== reading wrong format should fail =="
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index 21231cadd3..75b5e8f314 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -62,8 +62,8 @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format
make_test_img_with_fmt() {
# Shadow global variables within this function
- local IMGFMT="$1" IMGOPTS=""
- _make_test_img "$2"
+ local IMGFMT="$1"
+ _make_test_img --no-opts "$2"
}
qemu_io_with_fmt() {
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 1d4f6786db..4d3d08ad6f 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -66,8 +66,8 @@ if [ "$IMGFMT" = "vpc" ]; then
fi
_make_test_img 4G
$QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
-IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
- _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+ _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
$QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
# Ensure that a read of two clusters, but where one is already allocated,
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index 2eb377d682..55a1874dcd 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -63,8 +63,8 @@ if [ "$IMGFMT" = "vpc" ]; then
fi
_make_test_img 4G
$QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
-IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
- _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
+IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
+ _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
$QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
# Ensure that a read of two clusters, but where one is already allocated,
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 09/18] iotests: Drop IMGOPTS use in 267
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (7 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 10/18] iotests: Avoid qemu-img create Max Reitz
` (8 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
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 <mreitz@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 95f885442f..529f5f9afe 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
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 10/18] iotests: Avoid qemu-img create
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (8 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 09/18] iotests: Drop IMGOPTS use in 267 Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 11/18] iotests: Use _rm_test_img for deleting test images Max Reitz
` (7 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
Use _make_test_img whenever possible. This way, we will not ignore
user-specified image options.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/094 | 2 +-
tests/qemu-iotests/111 | 3 +--
tests/qemu-iotests/123 | 2 +-
tests/qemu-iotests/153 | 2 +-
tests/qemu-iotests/200 | 4 ++--
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index 9343e09492..d645952d54 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -45,7 +45,7 @@ _supported_proto nbd
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
_make_test_img 64M
-$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create
+TEST_IMG_FILE="$TEST_DIR/source.$IMGFMT" IMGPROTO=file _make_test_img 64M
_launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \
-nodefaults
diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index 490a5bbcb5..3b43d1bd83 100755
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111
@@ -41,8 +41,7 @@ _supported_fmt qed qcow qcow2 vmdk
_supported_proto file
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
-$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
- | _filter_testdir | _filter_imgfmt
+_make_test_img -b "$TEST_IMG.inexistent"
# success, all done
echo '*** done'
diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
index d33950eb54..74d40d0478 100755
--- a/tests/qemu-iotests/123
+++ b/tests/qemu-iotests/123
@@ -44,7 +44,7 @@ _supported_os Linux
SRC_IMG="$TEST_DIR/source.$IMGFMT"
_make_test_img 1M
-$QEMU_IMG create -f $IMGFMT "$SRC_IMG" 1M | _filter_img_create
+TEST_IMG_FILE=$SRC_IMG IMGPROTO=file _make_test_img 1M
$QEMU_IO -c 'write -P 42 0 1M' "$SRC_IMG" | _filter_qemu_io
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index c969a1a16f..e59090259c 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -98,7 +98,7 @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do
echo
echo "== Creating test image =="
- $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filter_img_create
+ _make_test_img -b "${TEST_IMG}.base"
echo
echo "== Launching QEMU, opts: '$opts1' =="
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index 72d431f251..d904885136 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -46,8 +46,8 @@ _supported_proto file
BACKING_IMG="${TEST_DIR}/backing.img"
TEST_IMG="${TEST_DIR}/test.img"
-${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create
-${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create
+TEST_IMG="$BACKING_IMG" _make_test_img 512M
+_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M
${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 11/18] iotests: Use _rm_test_img for deleting test images
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (9 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 10/18] iotests: Avoid qemu-img create Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 12/18] iotests: Avoid cp/mv of " Max Reitz
` (6 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
Just rm will not delete external data files. Use _rm_test_img every
time we delete a test image.
(In the process, clean up the indentation of every _cleanup() this patch
touches.)
((Also, use quotes consistently. I am happy to see unquoted instances
like "rm -rf $TEST_DIR/..." go.))
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/005 | 2 +-
tests/qemu-iotests/019 | 6 +++---
tests/qemu-iotests/020 | 6 +++---
tests/qemu-iotests/024 | 10 +++++-----
tests/qemu-iotests/028 | 2 +-
tests/qemu-iotests/029 | 2 +-
tests/qemu-iotests/043 | 4 +++-
tests/qemu-iotests/048 | 2 +-
tests/qemu-iotests/050 | 4 ++--
tests/qemu-iotests/053 | 4 ++--
tests/qemu-iotests/058 | 2 +-
tests/qemu-iotests/059 | 2 +-
tests/qemu-iotests/061 | 2 +-
tests/qemu-iotests/063 | 6 ++++--
tests/qemu-iotests/069 | 2 +-
tests/qemu-iotests/074 | 2 +-
tests/qemu-iotests/080 | 2 +-
tests/qemu-iotests/081 | 6 +++---
tests/qemu-iotests/085 | 9 ++++++---
tests/qemu-iotests/088 | 2 +-
tests/qemu-iotests/092 | 2 +-
tests/qemu-iotests/094 | 2 +-
tests/qemu-iotests/095 | 5 +++--
tests/qemu-iotests/099 | 7 ++++---
tests/qemu-iotests/109 | 4 ++--
tests/qemu-iotests/110 | 4 ++--
tests/qemu-iotests/122 | 6 ++++--
tests/qemu-iotests/123 | 2 +-
tests/qemu-iotests/141 | 4 +++-
tests/qemu-iotests/142 | 2 +-
tests/qemu-iotests/144 | 4 +++-
tests/qemu-iotests/153 | 10 +++-------
tests/qemu-iotests/156 | 8 ++++++--
tests/qemu-iotests/159 | 2 +-
tests/qemu-iotests/160 | 3 ++-
tests/qemu-iotests/161 | 4 ++--
tests/qemu-iotests/170 | 2 +-
tests/qemu-iotests/172 | 6 +++---
tests/qemu-iotests/173 | 3 ++-
tests/qemu-iotests/178 | 2 +-
tests/qemu-iotests/182 | 2 +-
tests/qemu-iotests/183 | 2 +-
tests/qemu-iotests/185 | 4 ++--
tests/qemu-iotests/187 | 6 +++---
tests/qemu-iotests/190 | 2 +-
tests/qemu-iotests/191 | 6 +++---
tests/qemu-iotests/195 | 2 +-
tests/qemu-iotests/197 | 2 +-
tests/qemu-iotests/200 | 3 ++-
tests/qemu-iotests/215 | 2 +-
tests/qemu-iotests/225 | 2 +-
tests/qemu-iotests/229 | 3 ++-
tests/qemu-iotests/232 | 4 +++-
tests/qemu-iotests/243 | 2 +-
tests/qemu-iotests/244 | 4 ++--
tests/qemu-iotests/247 | 4 +++-
tests/qemu-iotests/249 | 4 ++--
tests/qemu-iotests/252 | 2 +-
58 files changed, 119 insertions(+), 96 deletions(-)
diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index 58442762fe..2b651f2c37 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -62,7 +62,7 @@ if [ "$IMGFMT" = "raw" ]; then
if ! truncate --size=5T "$TEST_IMG"; then
_notrun "file system on $TEST_DIR does not support large enough files"
fi
- rm "$TEST_IMG"
+ _rm_test_img "$TEST_IMG"
fi
echo
diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index b4f5234609..813a84acac 100755
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -30,9 +30,9 @@ status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
- rm -f "$TEST_IMG.base"
- rm -f "$TEST_IMG.orig"
+ _cleanup_test_img
+ _rm_test_img "$TEST_IMG.base"
+ _rm_test_img "$TEST_IMG.orig"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index f41b92f35f..20f8f185d0 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -28,9 +28,9 @@ status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
- rm -f "$TEST_IMG.base"
- rm -f "$TEST_IMG.orig"
+ _cleanup_test_img
+ _rm_test_img "$TEST_IMG.base"
+ _rm_test_img "$TEST_IMG.orig"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index 23298c6f59..e2e766241e 100755
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@@ -29,12 +29,12 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_DIR/t.$IMGFMT.base_old"
- rm -f "$TEST_DIR/t.$IMGFMT.base_new"
+ _rm_test_img "$TEST_DIR/t.$IMGFMT.base_old"
+ _rm_test_img "$TEST_DIR/t.$IMGFMT.base_new"
- rm -f "$TEST_DIR/subdir/t.$IMGFMT"
- rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
- rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
+ _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT"
+ _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_old"
+ _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_new"
rmdir "$TEST_DIR/subdir" 2> /dev/null
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index 71301ec6e5..caf1258647 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -32,7 +32,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
- rm -f "${TEST_IMG}.copy"
+ _rm_test_img "${TEST_IMG}.copy"
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index 94c2713132..9254ede5e5 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -28,7 +28,7 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f $TEST_IMG.snap
+ _rm_test_img "$TEST_IMG.snap"
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index 67cc7e74c2..b102e49208 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -29,7 +29,9 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG".[123].base
+ for img in "$TEST_IMG".[123].base; do
+ _rm_test_img "$img"
+ done
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
index bde408ca92..a8feb76184 100755
--- a/tests/qemu-iotests/048
+++ b/tests/qemu-iotests/048
@@ -31,7 +31,7 @@ _cleanup()
{
echo "Cleanup"
_cleanup_test_img
- rm "${TEST_IMG_FILE2}"
+ _rm_test_img "${TEST_IMG_FILE2}"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index 272ecab195..cdc5356541 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -29,8 +29,8 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.old"
- rm -f "$TEST_IMG.new"
+ _rm_test_img "$TEST_IMG.old"
+ _rm_test_img "$TEST_IMG.new"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
index e82bb69881..71d299c4f9 100755
--- a/tests/qemu-iotests/053
+++ b/tests/qemu-iotests/053
@@ -28,8 +28,8 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f "$TEST_IMG.orig"
- _cleanup_test_img
+ _rm_test_img "$TEST_IMG.orig"
+ _cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
index 8c3212a72f..ed01115fa3 100755
--- a/tests/qemu-iotests/058
+++ b/tests/qemu-iotests/058
@@ -42,7 +42,7 @@ _cleanup()
{
nbd_server_stop
_cleanup_test_img
- rm -f "$converted_image"
+ _rm_test_img "$converted_image"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index 3941c3f0c2..5438025285 100755
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.qcow2"
+ IMGFMT=qcow2 _rm_test_img "$TEST_IMG.qcow2"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index 0480be0141..b4076d8e8b 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f $TEST_IMG.data
+ _rm_test_img "$TEST_IMG.data"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index 7cf0427af4..eef2b8a534 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -29,8 +29,10 @@ status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
- rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2"
+ _cleanup_test_img
+ for img in "$TEST_IMG".{orig,raw1,raw2,target}; do
+ _rm_test_img "$img"
+ done
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index 3974714852..b997b127f0 100755
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@@ -47,7 +47,7 @@ echo "=== Creating an image with a backing file and deleting that file ==="
echo
TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE
_make_test_img -b "$TEST_IMG.base" $IMG_SIZE
-rm -f "$TEST_IMG.base"
+_rm_test_img "$TEST_IMG.base"
# Just open the image and close it right again (this should print an error message)
$QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index bb4ad1cc08..62be89a0d9 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074
@@ -31,7 +31,7 @@ _cleanup()
{
echo "Cleanup"
_cleanup_test_img
- rm "${TEST_IMG2}"
+ _rm_test_img "${TEST_IMG2}"
rm -f "$TEST_DIR/blkdebug.conf"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index 4bcb5021e8..b1ecafb41e 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -28,7 +28,7 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f $TEST_IMG.snap
+ _rm_test_img "$TEST_IMG.snap"
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index 85acdf76d4..537d40dfd5 100755
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -28,9 +28,9 @@ status=1 # failure is the default!
_cleanup()
{
- rm -rf $TEST_DIR/1.raw
- rm -rf $TEST_DIR/2.raw
- rm -rf $TEST_DIR/3.raw
+ _rm_test_img "$TEST_DIR/1.raw"
+ _rm_test_img "$TEST_DIR/2.raw"
+ _rm_test_img "$TEST_DIR/3.raw"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index d40fdab542..bbea1252d2 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -41,10 +41,13 @@ _cleanup()
_cleanup_qemu
for i in $(seq 1 ${SNAPSHOTS})
do
- rm -f "${TEST_DIR}/${i}-${snapshot_virt0}"
- rm -f "${TEST_DIR}/${i}-${snapshot_virt1}"
+ _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}"
+ _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt1}"
+ done
+ for img in "${TEST_IMG}".{1,2,base}
+ do
+ _rm_test_img "$img"
done
- rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
index b44edd0cf9..ef1163346c 100755
--- a/tests/qemu-iotests/088
+++ b/tests/qemu-iotests/088
@@ -28,7 +28,7 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f $TEST_IMG.snap
+ _rm_test_img "$TEST_IMG.snap"
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092
index e2e0726de1..40ec62b6f1 100755
--- a/tests/qemu-iotests/092
+++ b/tests/qemu-iotests/092
@@ -28,7 +28,7 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f $TEST_IMG.snap
+ _rm_test_img "$TEST_IMG.snap"
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index d645952d54..2d3e1004d3 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -30,7 +30,7 @@ _cleanup()
{
_cleanup_qemu
_cleanup_test_img
- rm -f "$TEST_DIR/source.$IMGFMT"
+ _rm_test_img "$TEST_DIR/source.$IMGFMT"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index 58fe174b5e..155ae86aa7 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -32,8 +32,9 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
- rm -f "${TEST_IMG}.base" "${TEST_IMG}.snp1"
- _cleanup_test_img
+ _rm_test_img "${TEST_IMG}.base"
+ _rm_test_img "${TEST_IMG}.snp1"
+ _cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index c3cf66798a..b383c11e6a 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099
@@ -29,7 +29,10 @@ status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
+ _cleanup_test_img
+ _rm_test_img "$TEST_IMG.compare"
+ rm -f "$TEST_DIR/blkdebug.conf"
+
}
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -121,8 +124,6 @@ echo
test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG"
-rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf"
-
# success, all done
echo "*** done"
rm -f $seq.full
diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
index 9897ceb6cd..ba638db11f 100755
--- a/tests/qemu-iotests/109
+++ b/tests/qemu-iotests/109
@@ -29,8 +29,8 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
- rm -f $TEST_IMG.src
- _cleanup_test_img
+ _rm_test_img "$TEST_IMG.src"
+ _cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index 2ef516baf1..f78df0e6e1 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -28,8 +28,8 @@ status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
- rm -f "$TEST_IMG.copy"
+ _cleanup_test_img
+ _rm_test_img "$TEST_IMG.copy"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
index 059011ebb1..dfa350936f 100755
--- a/tests/qemu-iotests/122
+++ b/tests/qemu-iotests/122
@@ -28,8 +28,10 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f "$TEST_IMG".[123]
- _cleanup_test_img
+ for img in "$TEST_IMG".[123]; do
+ _rm_test_img "$img"
+ done
+ _cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
index 74d40d0478..01b771c76e 100755
--- a/tests/qemu-iotests/123
+++ b/tests/qemu-iotests/123
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$SRC_IMG"
+ _rm_test_img "$SRC_IMG"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index 8c2ae79f2b..5192d256e3 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -30,7 +30,9 @@ _cleanup()
{
_cleanup_qemu
_cleanup_test_img
- rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
+ for img in "$TEST_DIR"/{b,m,o}.$IMGFMT; do
+ _rm_test_img "$img"
+ done
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
index 6b62271876..daefcbaa58 100755
--- a/tests/qemu-iotests/142
+++ b/tests/qemu-iotests/142
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f $TEST_IMG.snap
+ _rm_test_img "$TEST_IMG.snap"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
index 011ed4f2bc..4569ac0b4b 100755
--- a/tests/qemu-iotests/144
+++ b/tests/qemu-iotests/144
@@ -34,7 +34,9 @@ TMP_SNAP2=${TEST_DIR}/tmp2.qcow2
_cleanup()
{
_cleanup_qemu
- rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"
+ for img in "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"; do
+ _rm_test_img "$img"
+ done
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index e59090259c..2b13111768 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -30,13 +30,9 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "${TEST_IMG}.base"
- rm -f "${TEST_IMG}.overlay"
- rm -f "${TEST_IMG}.convert"
- rm -f "${TEST_IMG}.a"
- rm -f "${TEST_IMG}.b"
- rm -f "${TEST_IMG}.c"
- rm -f "${TEST_IMG}.lnk"
+ for img in "${TEST_IMG}".{base,overlay,convert,a,b,c,lnk}; do
+ _rm_test_img "$img"
+ done
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index 2ffa3ca942..3f27db71f2 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -37,7 +37,9 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
- rm -f "$TEST_IMG"{,.target}{,.backing,.overlay}
+ for img in "$TEST_IMG"{,.target}{,.backing,.overlay}; do
+ _rm_test_img "$img"
+ done
}
trap "_cleanup; exit \$status" 0 1 2 3 15
@@ -120,7 +122,9 @@ _send_qemu_cmd $QEMU_HANDLE \
'"status": "null"'
# Remove the source images
-rm -f "$TEST_IMG{,.backing,.overlay}"
+for img in "$TEST_IMG{,.backing,.overlay}"; do
+ _rm_test_img "$img"
+done
echo
diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
index 2557140ac2..f9690053a2 100755
--- a/tests/qemu-iotests/159
+++ b/tests/qemu-iotests/159
@@ -28,7 +28,7 @@ status=1
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.out"
+ _rm_test_img "$TEST_IMG.out"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160
index df89d3864b..0572b5ae9a 100755
--- a/tests/qemu-iotests/160
+++ b/tests/qemu-iotests/160
@@ -28,7 +28,8 @@ status=1
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd"
+ _rm_test_img "$TEST_IMG.out"
+ _rm_test_img "$TEST_IMG.out.dd"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
index 456a4bd8c4..f572a19af2 100755
--- a/tests/qemu-iotests/161
+++ b/tests/qemu-iotests/161
@@ -30,8 +30,8 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.base"
- rm -f "$TEST_IMG.int"
+ _rm_test_img "$TEST_IMG.base"
+ _rm_test_img "$TEST_IMG.int"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
index 05dd6ed6c3..6c8f0e8085 100755
--- a/tests/qemu-iotests/170
+++ b/tests/qemu-iotests/170
@@ -28,7 +28,7 @@ status=1
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.out"
+ _rm_test_img "$TEST_IMG.out"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
index d67997e5f6..7195fb895a 100755
--- a/tests/qemu-iotests/172
+++ b/tests/qemu-iotests/172
@@ -28,9 +28,9 @@ status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
- rm -f "$TEST_IMG.2"
- rm -f "$TEST_IMG.3"
+ _cleanup_test_img
+ _rm_test_img "$TEST_IMG.2"
+ _rm_test_img "$TEST_IMG.3"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index 9e2fa2e73c..bba26f0d2a 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173
@@ -29,7 +29,8 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
- rm -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1"
+ _rm_test_img "${TEST_DIR}/image.base"
+ _rm_test_img "${TEST_DIR}/image.snp1"
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
index 75b5e8f314..51a70fe669 100755
--- a/tests/qemu-iotests/178
+++ b/tests/qemu-iotests/178
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.converted"
+ _rm_test_img "$TEST_IMG.converted"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index 7f494eb9bb..8de724e7ec 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182
@@ -30,7 +30,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.overlay"
+ _rm_test_img "$TEST_IMG.overlay"
rm -f "$TEST_DIR/nbd.socket"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index 04fb344d08..eff8e0216c 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -31,7 +31,7 @@ MIG_SOCKET="${TEST_DIR}/migrate"
_cleanup()
{
rm -f "${MIG_SOCKET}"
- rm -f "${TEST_IMG}.dest"
+ _rm_test_img "${TEST_IMG}.dest"
_cleanup_test_img
_cleanup_qemu
}
diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
index 454ff600cc..e50f19ebf0 100755
--- a/tests/qemu-iotests/185
+++ b/tests/qemu-iotests/185
@@ -28,8 +28,8 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f "${TEST_IMG}.mid"
- rm -f "${TEST_IMG}.copy"
+ _rm_test_img "${TEST_IMG}.mid"
+ _rm_test_img "${TEST_IMG}.copy"
_cleanup_test_img
_cleanup_qemu
}
diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index 2fcef9e2bd..c6e1dc57a0 100755
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187
@@ -28,9 +28,9 @@ status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
- rm -f "$TEST_IMG.2"
- rm -f "$TEST_IMG.3"
+ _cleanup_test_img
+ _rm_test_img "$TEST_IMG.2"
+ _rm_test_img "$TEST_IMG.3"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index 5890ff9cfc..6d41650438 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.converted"
+ _rm_test_img "$TEST_IMG.converted"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 21c16a32cb..23ab0ce899 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -28,9 +28,9 @@ status=1 # failure is the default!
_cleanup()
{
- rm -f "${TEST_IMG}.mid"
- rm -f "${TEST_IMG}.ovl2"
- rm -f "${TEST_IMG}.ovl3"
+ _rm_test_img "${TEST_IMG}.mid"
+ _rm_test_img "${TEST_IMG}.ovl2"
+ _rm_test_img "${TEST_IMG}.ovl3"
_cleanup_test_img
_cleanup_qemu
}
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index ef7b9a94e2..48984b7ac1 100755
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.mid"
+ _rm_test_img "$TEST_IMG.mid"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 4d3d08ad6f..95f05b0e34 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -43,7 +43,7 @@ esac
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_WRAP"
+ _rm_test_img "$TEST_WRAP"
rm -f "$BLKDBG_CONF"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index d904885136..a2cdd7f83d 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -31,7 +31,8 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_qemu
- rm -f "${TEST_IMG}" "${BACKING_IMG}"
+ _rm_test_img "${TEST_IMG}"
+ _rm_test_img "${BACKING_IMG}"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index 55a1874dcd..f99bae78c7 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -40,7 +40,7 @@ esac
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_WRAP"
+ _rm_test_img "$TEST_WRAP"
rm -f "$BLKDBG_CONF"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225
index fbd7404791..c9a334c7e9 100755
--- a/tests/qemu-iotests/225
+++ b/tests/qemu-iotests/225
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.not_base"
+ _rm_test_img "$TEST_IMG.not_base"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index e18a464fe0..866168b236 100755
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -31,7 +31,8 @@ _cleanup()
{
_cleanup_qemu
_cleanup_test_img
- rm -f "$TEST_IMG" "$DEST_IMG"
+ _rm_test_img "$TEST_IMG"
+ _rm_test_img "$DEST_IMG"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
index 65b0e42063..685356ac3b 100755
--- a/tests/qemu-iotests/232
+++ b/tests/qemu-iotests/232
@@ -29,7 +29,9 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f $TEST_IMG.[01234]
+ for img in "$TEST_IMG".[01234]; do
+ _rm_test_img "$img"
+ done
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index 2b84b896db..3dc3b6a711 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f $TEST_IMG.data
+ _rm_test_img "$TEST_IMG.data"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index 0375bc12d4..13263292b0 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -29,8 +29,8 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f $TEST_IMG.data
- rm -f $TEST_IMG.src
+ _rm_test_img "$TEST_IMG.data"
+ _rm_test_img "$TEST_IMG.src"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index c853b73819..87e37b39e2 100755
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247
@@ -29,7 +29,9 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f $TEST_IMG.[01234]
+ for img in "$TEST_IMG".[01234]; do
+ _rm_test_img "$img"
+ done
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
index e4650ecf6b..2b99c9789e 100755
--- a/tests/qemu-iotests/249
+++ b/tests/qemu-iotests/249
@@ -30,8 +30,8 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.base"
- rm -f "$TEST_IMG.int"
+ _rm_test_img "$TEST_IMG.base"
+ _rm_test_img "$TEST_IMG.int"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252
index f6c8f71444..83280c1715 100755
--- a/tests/qemu-iotests/252
+++ b/tests/qemu-iotests/252
@@ -29,7 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
_cleanup_test_img
- rm -f "$TEST_IMG.base_new"
+ _rm_test_img "$TEST_IMG.base_new"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 12/18] iotests: Avoid cp/mv of test images
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (10 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 11/18] iotests: Use _rm_test_img for deleting test images Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 13/18] iotests: Make 091 work with data_file Max Reitz
` (5 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
This will not work with external data files, so try to get tests working
without it as far as possible.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/063 | 12 ++++--------
tests/qemu-iotests/063.out | 3 ++-
tests/qemu-iotests/085 | 9 +++------
tests/qemu-iotests/085.out | 8 ++++----
4 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index eef2b8a534..c750b3806e 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -51,15 +51,13 @@ _unsupported_imgopts "subformat=monolithicFlat" \
_make_test_img 4M
echo "== Testing conversion with -n fails with no target file =="
-# check .orig file does not exist
-rm -f "$TEST_IMG.orig"
if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
exit 1
fi
echo "== Testing conversion with -n succeeds with a target file =="
-rm -f "$TEST_IMG.orig"
-cp "$TEST_IMG" "$TEST_IMG.orig"
+_rm_test_img "$TEST_IMG.orig"
+TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
exit 1
fi
@@ -85,10 +83,8 @@ fi
_check_test_img
echo "== Testing conversion to a smaller file fails =="
-rm -f "$TEST_IMG.orig"
-mv "$TEST_IMG" "$TEST_IMG.orig"
-_make_test_img 2M
-if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
+TEST_IMG="$TEST_IMG.target" _make_test_img 2M
+if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
exit 1
fi
diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
index 7b691b2c9e..890b719bf0 100644
--- a/tests/qemu-iotests/063.out
+++ b/tests/qemu-iotests/063.out
@@ -2,11 +2,12 @@ QA output created by 063
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
== Testing conversion with -n fails with no target file ==
== Testing conversion with -n succeeds with a target file ==
+Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
== Testing conversion to raw is the same after conversion with -n ==
== Testing conversion back to original format ==
No errors were found on the image.
== Testing conversion to a smaller file fails ==
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
+Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
== Regression testing for copy offloading bug ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index bbea1252d2..46981dbb64 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -105,8 +105,7 @@ add_snapshot_image()
{
base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
- _make_test_img -u -b "${base_image}" "$size"
- mv "${TEST_IMG}" "${snapshot_file}"
+ TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
}
@@ -122,10 +121,8 @@ blockdev_snapshot()
size=128M
-_make_test_img $size
-mv "${TEST_IMG}" "${TEST_IMG}.1"
-_make_test_img $size
-mv "${TEST_IMG}" "${TEST_IMG}.2"
+TEST_IMG="$TEST_IMG.1" _make_test_img $size
+TEST_IMG="$TEST_IMG.2" _make_test_img $size
echo
echo === Running QEMU ===
diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
index 2a5f256cd3..313198f182 100644
--- a/tests/qemu-iotests/085.out
+++ b/tests/qemu-iotests/085.out
@@ -1,6 +1,6 @@
QA output created by 085
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
+Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
=== Running QEMU ===
@@ -55,10 +55,10 @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
=== Create a couple of snapshots using blockdev-snapshot ===
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
+Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
{"return": {}}
{"return": {}}
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
+Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
{"return": {}}
{"return": {}}
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 13/18] iotests: Make 091 work with data_file
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (11 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 12/18] iotests: Avoid cp/mv of " Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:34 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 14/18] iotests: Make 110 " Max Reitz
` (4 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
The image end offset as reported by qemu-img check is different when
using an external data file; we do not care about its value here, so we
can just filter it.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/091 | 3 ++-
tests/qemu-iotests/091.out | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index f4b44659ae..7536ca4607 100755
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -101,7 +101,8 @@ echo "Check image pattern"
${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io
echo "Running 'qemu-img check -r all \$TEST_IMG'"
-"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu
+"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu \
+ | sed '/Image end offset/d'
echo "*** done"
rm -f $seq.full
diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out
index 5017f8c2d9..343fac69e0 100644
--- a/tests/qemu-iotests/091.out
+++ b/tests/qemu-iotests/091.out
@@ -24,5 +24,4 @@ read 4194304/4194304 bytes at offset 0
Running 'qemu-img check -r all $TEST_IMG'
No errors were found on the image.
80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters
-Image end offset: 5570560
*** done
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 14/18] iotests: Make 110 work with data_file
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (12 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 13/18] iotests: Make 091 work with data_file Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:34 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 15/18] iotests: Make 137 " Max Reitz
` (3 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
The only difference is that the json:{} filename of the image looks
different. We actually do not care about that filename in this test, we
are only interested in (1) that there is a json:{} filename, and (2)
whether the backing filename can be constructed.
So just filter out the json:{} data, thus making this test pass both
with and without data_file.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/110 | 7 +++++--
tests/qemu-iotests/110.out | 4 ++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index f78df0e6e1..34459dcd60 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -67,6 +67,7 @@ echo
# Across blkdebug without a config file, you cannot reconstruct filenames, so
# qemu is incapable of knowing the directory of the top image from the filename
# alone. However, using bdrv_dirname(), it should still work.
+# (Filter out the json:{} filename so this test works with external data files)
TEST_IMG="json:{
'driver': '$IMGFMT',
'file': {
@@ -82,7 +83,8 @@ TEST_IMG="json:{
}
]
}
-}" _img_info | _filter_img_info | grep -v 'backing file format'
+}" _img_info | _filter_img_info | grep -v 'backing file format' \
+ | sed -e 's#^image: json:.*#image: json:{ /* filtered */ }#'
echo
echo '=== Backing name is always relative to the backed image ==='
@@ -114,7 +116,8 @@ TEST_IMG="json:{
}
]
}
-}" _img_info | _filter_img_info | grep -v 'backing file format'
+}" _img_info | _filter_img_info | grep -v 'backing file format' \
+ | sed -e 's#^image: json:.*#image: json:{ /* filtered */ }#'
# success, all done
diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
index f60b26390e..f835553a99 100644
--- a/tests/qemu-iotests/110.out
+++ b/tests/qemu-iotests/110.out
@@ -11,7 +11,7 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
=== Non-reconstructable filename ===
-image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
+image: json:{ /* filtered */ }
file format: IMGFMT
virtual size: 64 MiB (67108864 bytes)
backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
@@ -22,7 +22,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
=== Nodes without a common directory ===
-image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-threshold": 1}}
+image: json:{ /* filtered */ }
file format: IMGFMT
virtual size: 64 MiB (67108864 bytes)
backing file: t.IMGFMT.base (cannot determine actual path)
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 15/18] iotests: Make 137 work with data_file
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (13 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 14/18] iotests: Make 110 " Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:38 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 16/18] iotests: Make 198 " Max Reitz
` (2 subsequent siblings)
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
When using an external data file, there are no refcounts for data
clusters. We thus have to adjust the corruption test in this patch to
not be based around a data cluster allocation, but the L2 table
allocation (L2 tables are still refcounted with external data files).
Doing so means this test works both with and without external data
files.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/137 | 10 ++++++----
tests/qemu-iotests/137.out | 4 +---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index 6cf2997577..dd3484205e 100755
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137
@@ -138,14 +138,16 @@ $QEMU_IO \
"$TEST_IMG" 2>&1 | _filter_qemu_io
# The dirty bit must not be set
-$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
+# (Filter the external data file bit)
+$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
+ | sed -e 's/0x4/0x0/'
# Similarly we can test whether corruption detection has been enabled:
-# Create L1/L2, overwrite first entry in refcount block, allocate something.
+# Create L1, overwrite refcounts, force allocation of L2 by writing
+# data.
# Disabling the checks should fail, so the corruption must be detected.
_make_test_img 64M
-$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io
-poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00"
+poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00"
$QEMU_IO \
-c "reopen -o overlap-check=none,lazy-refcounts=42" \
-c "write 64k 64k" \
diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
index 1c6569eb2c..bd5f76d604 100644
--- a/tests/qemu-iotests/137.out
+++ b/tests/qemu-iotests/137.out
@@ -38,9 +38,7 @@ wrote 512/512 bytes at offset 0
./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
incompatible_features 0x0
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-wrote 65536/65536 bytes at offset 0
-64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
-qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed
+qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table at offset 0; further corruption events will be suppressed
write failed: Input/output error
*** done
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 16/18] iotests: Make 198 work with data_file
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (14 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 15/18] iotests: Make 137 " Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:38 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 17/18] iotests: Disable data_file where it cannot be used Max Reitz
2019-09-27 9:42 ` [PATCH 18/18] iotests: Allow check -o data_file Max Reitz
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
We do not care about the json:{} filenames here, so we can just filter
them out and thus make the test work both with and without external data
files.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/198 | 6 ++++--
tests/qemu-iotests/198.out | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
index c8f824cfae..d9981942a7 100755
--- a/tests/qemu-iotests/198
+++ b/tests/qemu-iotests/198
@@ -92,13 +92,15 @@ echo
echo "== checking image base =="
$QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
| sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
- -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+ -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+ -e 's#image: json:.*#image: json:{ /* filtered */ }#'
echo
echo "== checking image layer =="
$QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \
| sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
- -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
+ -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
+ -e 's#image: json:.*#image: json:{ /* filtered */ }#'
# success, all done
diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
index e86b175e39..831ce3a289 100644
--- a/tests/qemu-iotests/198.out
+++ b/tests/qemu-iotests/198.out
@@ -32,7 +32,7 @@ read 16777216/16777216 bytes at offset 0
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== checking image base ==
-image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
+image: json:{ /* filtered */ }
file format: IMGFMT
virtual size: 16 MiB (16777216 bytes)
Format specific information:
@@ -74,7 +74,7 @@ Format specific information:
master key iters: 1024
== checking image layer ==
-image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
+image: json:{ /* filtered */ }
file format: IMGFMT
virtual size: 16 MiB (16777216 bytes)
backing file: TEST_DIR/t.IMGFMT.base
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 17/18] iotests: Disable data_file where it cannot be used
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (15 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 16/18] iotests: Make 198 " Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:39 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 18/18] iotests: Allow check -o data_file Max Reitz
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/007 | 5 +++--
tests/qemu-iotests/014 | 2 ++
tests/qemu-iotests/015 | 5 +++--
tests/qemu-iotests/026 | 5 ++++-
tests/qemu-iotests/029 | 5 +++--
tests/qemu-iotests/031 | 6 +++---
tests/qemu-iotests/036 | 5 +++--
tests/qemu-iotests/039 | 3 +++
tests/qemu-iotests/046 | 2 ++
tests/qemu-iotests/048 | 2 ++
tests/qemu-iotests/051 | 5 +++--
tests/qemu-iotests/058 | 5 +++--
tests/qemu-iotests/060 | 6 ++++--
tests/qemu-iotests/061 | 6 ++++--
tests/qemu-iotests/062 | 2 +-
tests/qemu-iotests/066 | 2 +-
tests/qemu-iotests/067 | 6 ++++--
tests/qemu-iotests/068 | 5 +++--
tests/qemu-iotests/071 | 3 +++
tests/qemu-iotests/073 | 2 ++
tests/qemu-iotests/074 | 2 ++
tests/qemu-iotests/080 | 5 +++--
tests/qemu-iotests/090 | 2 ++
tests/qemu-iotests/098 | 4 +++-
tests/qemu-iotests/099 | 3 ++-
tests/qemu-iotests/103 | 5 +++--
tests/qemu-iotests/108 | 6 ++++--
tests/qemu-iotests/112 | 5 +++--
tests/qemu-iotests/114 | 2 ++
tests/qemu-iotests/121 | 3 +++
tests/qemu-iotests/138 | 2 ++
tests/qemu-iotests/156 | 2 ++
tests/qemu-iotests/176 | 7 +++++--
tests/qemu-iotests/191 | 2 ++
tests/qemu-iotests/201 | 6 +++---
tests/qemu-iotests/214 | 3 ++-
tests/qemu-iotests/217 | 3 ++-
tests/qemu-iotests/220 | 5 +++--
tests/qemu-iotests/243 | 6 ++++--
tests/qemu-iotests/244 | 5 +++--
tests/qemu-iotests/250 | 2 ++
tests/qemu-iotests/267 | 5 +++--
42 files changed, 116 insertions(+), 51 deletions(-)
diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 7d3544b479..160683adf8 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -41,8 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
# refcount_bits must be at least 4 so we can create ten internal snapshots
-# (1 bit supports none, 2 bits support two, 4 bits support 14)
-_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]'
+# (1 bit supports none, 2 bits support two, 4 bits support 14);
+# snapshot are generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=\(1\|2\)[^0-9]' data_file
echo
echo "creating image"
diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index 2f728a1956..e1221c0fff 100755
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -43,6 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# Compression and snapshots do not work with external data files
+_unsupported_imgopts data_file
TEST_OFFSETS="0 4294967296"
TEST_OPS="writev read write readv"
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index eec5387f3d..4d8effd0ae 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# actually any format that supports snapshots
_supported_fmt qcow2
_supported_proto generic
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
echo
echo "creating image"
diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index 3430029ed6..a4aa74764f 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -49,7 +49,10 @@ _supported_cache_modes writethrough none
# 32 and 64 bits do not work either, however, due to different leaked cluster
# count on error.
# Thus, the only remaining option is refcount_bits=16.
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+#
+# As for data_file, none of the refcount tests can work for it.
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' \
+ data_file
echo "Errors while writing 128 kB"
echo
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index 9254ede5e5..2161a4b87a 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -42,8 +42,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
offset_size=24
offset_l1_size=36
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index c44fcf91bb..646ecd593f 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -40,9 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-# We want to test compat=0.10, which does not support refcount widths
-# other than 16
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+# We want to test compat=0.10, which does not support external data
+# files or refcount widths other than 16
+_unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
CLUSTER_SIZE=65536
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index 57dda23b02..34abb77547 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -43,8 +43,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-# Only qcow2v3 and later supports feature bits
-_unsupported_imgopts 'compat=0.10'
+# Only qcow2v3 and later supports feature bits;
+# qcow2.py does not support external data files
+_unsupported_imgopts 'compat=0.10' data_file
echo
echo === Image with unknown incompatible feature bit ===
diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index 99563bf126..ddce48ab47 100755
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@@ -44,6 +44,9 @@ _supported_proto file
_supported_os Linux
_default_cache_mode writethrough
_supported_cache_modes writethrough
+# Some of these test cases expect no external data file so that all
+# clusters are part of the qcow2 image and refcounted
+_unsupported_imgopts data_file
size=128M
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 4e03ead7b1..a066eec605 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
+# data_file does not support compressed clusters
+_unsupported_imgopts data_file
CLUSTER_SIZE=64k
size=128M
diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
index a8feb76184..2af6b74b41 100755
--- a/tests/qemu-iotests/048
+++ b/tests/qemu-iotests/048
@@ -49,6 +49,8 @@ _compare()
_supported_fmt raw qcow2 qed luks
_supported_proto file
_supported_os Linux
+# Using 'cp' is incompatible with external data files
+_unsupported_imgopts data_file
# Remove once all tests are fixed to use TEST_IMG_FILE
# correctly and common.rc sets it unconditionally
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 9cd1d60d45..0053bad46a 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -39,8 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
# A compat=0.10 image is created in this test which does not support anything
-# other than refcount_bits=16
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+# other than refcount_bits=16;
+# it also will not support an external data file
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
do_run_qemu()
{
diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
index ed01115fa3..d5304bb404 100755
--- a/tests/qemu-iotests/058
+++ b/tests/qemu-iotests/058
@@ -56,8 +56,9 @@ _supported_fmt qcow2
_supported_proto file
_supported_os Linux
_require_command QEMU_NBD
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
nbd_snapshot_img="nbd:unix:$nbd_unix_socket"
diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index 92243c2edd..8ad0d7a904 100755
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -48,8 +48,10 @@ _filter_io_error()
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
-# These tests only work for compat=1.1 images with refcount_bits=16
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+# These tests only work for compat=1.1 images without an external
+# data file with refcount_bits=16
+_unsupported_imgopts 'compat=0.10' data_file \
+ 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
rt_offset=65536 # 0x10000 (XXX: just an assumption)
rb_offset=131072 # 0x20000 (XXX: just an assumption)
diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index b4076d8e8b..4e218798d8 100755
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -42,8 +42,10 @@ _supported_fmt qcow2
_supported_proto file
_supported_os Linux
# Conversion between different compat versions can only really work
-# with refcount_bits=16
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+# with refcount_bits=16;
+# we have explicit tests for data_file here, but the whole test does
+# not work with it
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
echo
echo "=== Testing version downgrade with zero expansion ==="
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index ac0d2a9a3b..68e52a6402 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
# We need zero clusters and snapshots
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
IMG_SIZE=64M
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index 9a15ba8027..d735a686fd 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
# Weneed zero clusters and snapshots
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
# Intentionally create an unaligned image
IMG_SIZE=$((64 * 1024 * 1024 + 512))
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index 926c79b37c..3bc6e719eb 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -32,8 +32,10 @@ status=1 # failure is the default!
_supported_fmt qcow2
_supported_proto file
-# Because anything other than 16 would change the output of query-block
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+# Because anything other than 16 would change the output of query-block,
+# and external data files would change the output of
+# query-named-block-ndoes
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
do_run_qemu()
{
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index 65650fca9a..c8748f5b02 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -39,8 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]' data_file
IMG_SIZE=128K
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index 4e31943244..88faebcc1d 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -39,6 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_require_drivers blkdebug blkverify
+# blkdebug can only inject errors on bs->file, not on the data_file,
+# so thie test does not work with external data files
+_unsupported_imgopts data_file
do_run_qemu()
{
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index e684b1b780..903dc9c9ab 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -39,6 +39,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
+# External data files do not support compressed clusters
+_unsupported_imgopts data_file
CLUSTER_SIZE=64k
size=128M
diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index 62be89a0d9..db03edf0b0 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074
@@ -50,6 +50,8 @@ _compare()
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# blkdebug can only inject errors on bs->file
+_unsupported_imgopts data_file
# Setup test basic parameters
TEST_IMG2=$TEST_IMG.2
diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index b1ecafb41e..a3d13c414e 100755
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -40,9 +40,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
-# - Internal snapshots are (currently) impossible with refcount_bits=1
+# - Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
# - This is generally a test for compat=1.1 images
-_unsupported_imgopts 'refcount_bits=1[^0-9]' 'compat=0.10'
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file 'compat=0.10'
header_size=104
diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index 9f8cfbb80f..1246e4f910 100755
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -38,6 +38,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
+# External data files do not support compressed clusters
+_unsupported_imgopts data_file
IMG_SIZE=128K
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index 2d68dc7d6c..ae712e3789 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -40,7 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_unsupported_imgopts 'compat=0.10'
+# blkdebug can only inject errors on bs->file, so external data files
+# do not work with this test
+_unsupported_imgopts 'compat=0.10' data_file
for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
index b383c11e6a..65e8e92572 100755
--- a/tests/qemu-iotests/099
+++ b/tests/qemu-iotests/099
@@ -46,8 +46,9 @@ _supported_fmt qcow qcow2 qed vdi vhdx vmdk vpc
_supported_proto file
_supported_os Linux
_require_drivers blkdebug blkverify
+# data_file would change the json:{} filenames
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat" \
- "subformat=twoGbMaxExtentSparse"
+ "subformat=twoGbMaxExtentSparse" data_file
do_run_qemu()
{
diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index 554b9de054..8c1ebe0443 100755
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -38,8 +38,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
IMG_SIZE=64K
diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index b0a6ae597b..6bbeb4f996 100755
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -41,8 +41,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
-# This test directly modifies a refblock so it relies on refcount_bits being 16
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
+# This test directly modifies a refblock so it relies on refcount_bits being 16;
+# and the low-level modification it performs are not tuned for external data
+# files
+_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
echo
echo '=== Repairing an image without any refcount table ==='
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 6850225939..20ff5c224a 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
# This test will set refcount_bits on its own which would conflict with the
-# manual setting; compat will be overridden as well
-_unsupported_imgopts refcount_bits 'compat=0.10'
+# manual setting; compat will be overridden as well;
+# and external data files do not work well with our refcount testing
+_unsupported_imgopts refcount_bits 'compat=0.10' data_file
print_refcount_bits()
{
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index f90a744fc0..26104fff6c 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -39,6 +39,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
+# qcow2.py does not work too well with external data files
+_unsupported_imgopts data_file
TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index 10db813d94..90ea0db737 100755
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -39,6 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# Refcount structures are used much differently with external data
+# files
+_unsupported_imgopts data_file
echo
echo '=== New refcount structures may not conflict with existing structures ==='
diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index 66ae9d5e78..7b0bc62a74 100755
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -40,6 +40,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# These refcount calculations do not work with external data files
+_unsupported_imgopts data_file
echo
echo '=== Check on an image with a multiple of 2^32 clusters ==='
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index 3f27db71f2..5559df63a5 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -51,6 +51,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto generic
_unsupported_proto vxhs
+# Copying files around with cp does not work with external data files
+_unsupported_imgopts data_file
# Create source disk
TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
index 50df4c00fa..117c8b6954 100755
--- a/tests/qemu-iotests/176
+++ b/tests/qemu-iotests/176
@@ -47,8 +47,11 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
-# Persistent dirty bitmaps require compat=1.1
-_unsupported_imgopts 'compat=0.10'
+# Persistent dirty bitmaps require compat=1.1;
+# Internal snapshots forbid using an external data file
+# (they work with refcount_bits=1 here, though, because there actually
+# is no data when creating the snapshot)
+_unsupported_imgopts 'compat=0.10' data_file
run_qemu()
{
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 23ab0ce899..b05db68141 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -43,6 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
+# An external data file would change the query-named-block-nodes output
+_unsupported_imgopts data_file
size=64M
diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201
index 7abf740fe4..3a458f18a0 100755
--- a/tests/qemu-iotests/201
+++ b/tests/qemu-iotests/201
@@ -43,9 +43,9 @@ _supported_fmt qcow2
_supported_proto generic
_supported_os Linux
-# Internal snapshots are (currently) impossible with refcount_bits=1
-# This was taken from test 080
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
size=64M
_make_test_img $size
diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index 21ec8a2ad8..0f2e61280a 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -39,7 +39,8 @@ _supported_proto file
# Repairing the corrupted image requires qemu-img check to store a
# refcount up to 3, which requires at least two refcount bits.
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# External data files do not support compressed clusters.
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
echo
diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
index 58a78a6098..d89116ccad 100755
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217
@@ -40,7 +40,8 @@ _supported_proto file
# This test needs clusters with at least a refcount of 2 so that
# OFLAG_COPIED is not set. refcount_bits=1 is therefore unsupported.
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# (As are external data files.)
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
echo
echo '=== Simulating an I/O error during snapshot deletion ==='
diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
index 3769f372cb..a88c59152b 100755
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -37,8 +37,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
-# To use a different refcount width but 16 bits we need compat=1.1
-_unsupported_imgopts 'compat=0.10'
+# To use a different refcount width but 16 bits we need compat=1.1,
+# and external data files do not support compressed clusters.
+_unsupported_imgopts 'compat=0.10' data_file
echo "== Creating huge file =="
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index 3dc3b6a711..a61852f6d9 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -40,8 +40,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
-# External data files do not work with compat=0.10
-_unsupported_imgopts 'compat=0.10'
+# External data files do not work with compat=0.10, and because there
+# is an explicit case for external data files here, we cannot allow
+# the user to specify whether to use one
+_unsupported_imgopts 'compat=0.10' data_file
for mode in off metadata falloc full; do
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index 13263292b0..0d1efee6ef 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -41,8 +41,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
-# External data files do not work with compat=0.10
-_unsupported_imgopts 'compat=0.10'
+# External data files do not work with compat=0.10, and because we use
+# our own external data file, we cannot let the user specify one
+_unsupported_imgopts 'compat=0.10' data_file
echo
echo "=== Create and open image with external data file ==="
diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index 670cf19076..9bb6b94d74 100755
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250
@@ -39,6 +39,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
_supported_os Linux
+# This test does not make much sense with external data files
+_unsupported_imgopts data_file
# This test checks that qcow2_process_discards does not truncate a discard
# request > 2G.
diff --git a/tests/qemu-iotests/267 b/tests/qemu-iotests/267
index 529f5f9afe..2a5d22780b 100755
--- a/tests/qemu-iotests/267
+++ b/tests/qemu-iotests/267
@@ -41,8 +41,9 @@ _supported_fmt qcow2
_supported_proto file
_supported_os Linux
-# Internal snapshots are (currently) impossible with refcount_bits=1
-_unsupported_imgopts 'refcount_bits=1[^0-9]'
+# Internal snapshots are (currently) impossible with refcount_bits=1,
+# and generally impossible with external data files
+_unsupported_imgopts 'refcount_bits=1[^0-9]' data_file
do_run_qemu()
{
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [PATCH 18/18] iotests: Allow check -o data_file
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
` (16 preceding siblings ...)
2019-09-27 9:42 ` [PATCH 17/18] iotests: Disable data_file where it cannot be used Max Reitz
@ 2019-09-27 9:42 ` Max Reitz
2019-09-29 16:39 ` Maxim Levitsky
17 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-27 9:42 UTC (permalink / raw)
To: qemu-block; +Cc: Kevin Wolf, qemu-devel, Max Reitz
The problem with allowing the data_file option is that you want to use a
different data file per image used in the test. Therefore, we need to
allow patterns like -o data_file='$TEST_IMG.data_file'.
Then, we need to filter it out from qemu-img map, qemu-img create, and
remove the data file in _rm_test_img.
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
tests/qemu-iotests/common.filter | 21 +++++++++++++++++++--
tests/qemu-iotests/common.rc | 10 +++++++++-
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index 841f7642af..a11f9a8972 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -115,7 +115,15 @@ _filter_actual_image_size()
# replace driver-specific options in the "Formatting..." line
_filter_img_create()
{
- $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
+ data_file_filter=()
+ if echo "$IMGOPTS" | grep -q 'data_file='; then
+ data_file=$(echo "$IMGOPTS" | sed -e 's/.*\(data_file=[^,]*\).*/\1/' \
+ -e "s#\\\$TEST_IMG#$TEST_IMG#")
+ data_file_filter=(-e "s# $data_file##")
+ fi
+
+ $SED "${data_file_filter[@]}" \
+ -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
-e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
-e "s#$TEST_DIR#TEST_DIR#g" \
-e "s#$IMGFMT#IMGFMT#g" \
@@ -198,9 +206,18 @@ _filter_img_info()
# human and json output
_filter_qemu_img_map()
{
+ data_file_filter=()
+ if echo "$IMGOPTS" | grep -q 'data_file='; then
+ data_file_pattern=$(echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \
+ -e 's#\$TEST_IMG#\\(.*\\)#')
+ data_file_filter=(-e "s#$data_file_pattern#\\1#")
+ fi
+
$SED -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \
-e 's/"offset": [0-9]\+/"offset": OFFSET/g' \
- -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt
+ -e 's/Mapped to *//' \
+ "${data_file_filter[@]}" \
+ | _filter_testdir | _filter_imgfmt
}
_filter_nbd()
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index f3784077de..834ece12e4 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -297,7 +297,8 @@ _make_test_img()
fi
if [ -n "$IMGOPTS" ]; then
- optstr=$(_optstr_add "$optstr" "$IMGOPTS")
+ imgopts_expanded=$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$img_name#")
+ optstr=$(_optstr_add "$optstr" "$imgopts_expanded")
fi
if [ -n "$IMGKEYSECRET" ]; then
object_options="--object secret,id=keysec0,data=$IMGKEYSECRET"
@@ -376,6 +377,13 @@ _rm_test_img()
# Remove all the extents for vmdk
"$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f 2 -d: \
| xargs -I {} rm -f "{}"
+ elif [ "$IMGFMT" = "qcow2" ]; then
+ # Remove external data file
+ if echo "$IMGOPTS" | grep -q 'data_file='; then
+ data_file=$(echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \
+ -e "s#\\\$TEST_IMG#$img#")
+ rm -f "$data_file"
+ fi
fi
rm -f "$img"
}
--
2.21.0
^ permalink raw reply related [flat|nested] 60+ messages in thread
* Re: [PATCH 01/18] iotests: Filter refcount_order in 036
2019-09-27 9:42 ` [PATCH 01/18] iotests: Filter refcount_order in 036 Max Reitz
@ 2019-09-29 16:31 ` Maxim Levitsky
2019-09-30 12:43 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:31 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> This test can run just fine with other values for refcount_bits, so we
> should filter the value from qcow2.py's dump-header.
>
> (036 currently ignores user-specified image options, but that will be
> fixed in the next patch.)
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/036 | 9 ++++++---
> tests/qemu-iotests/036.out | 6 +++---
> 2 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> index f06ff67408..69d0f9f903 100755
> --- a/tests/qemu-iotests/036
> +++ b/tests/qemu-iotests/036
> @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
>
> # Without feature table
> $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> _img_info
>
> # With feature table containing bit 63
> @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
> echo
> _make_test_img 64M
> $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>
> echo
> echo === Repair image ===
> echo
> _check_test_img -r all
>
> -$PYTHON qcow2.py "$TEST_IMG" dump-header
> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>
> # success, all done
> echo "*** done"
> diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
> index e489b44386..998c2a8a35 100644
> --- a/tests/qemu-iotests/036.out
> +++ b/tests/qemu-iotests/036.out
> @@ -19,7 +19,7 @@ snapshot_offset 0x0
> incompatible_features 0x8000000000000000
> compatible_features 0x0
> autoclear_features 0x0
> -refcount_order 4
> +refcount_order (filtered)
> header_length 104
>
> qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
> @@ -53,7 +53,7 @@ snapshot_offset 0x0
> incompatible_features 0x0
> compatible_features 0x0
> autoclear_features 0x8000000000000000
> -refcount_order 4
> +refcount_order (filtered)
> header_length 104
>
> Header extension:
> @@ -81,7 +81,7 @@ snapshot_offset 0x0
> incompatible_features 0x0
> compatible_features 0x0
> autoclear_features 0x0
> -refcount_order 4
> +refcount_order (filtered)
> header_length 104
>
> Header extension:
Minor notes:
1. Maybe put the sed command into a function to avoid duplication?
2. As I understand the test, it only checks the feature bits.
So maybe instead of blacklisting some of the values, white list
only the feature bits in the output?
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts
2019-09-27 9:42 ` [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
@ 2019-09-29 16:31 ` Maxim Levitsky
2019-09-30 12:59 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:31 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
> globally. That is not how it should be done; instead, they should
> simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
> default anyway).
>
> This makes the tests heed user-specified $IMGOPTS. Some do not work
> with all image options, though, so we need to disable them accordingly.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/036 | 3 +--
> tests/qemu-iotests/060 | 4 ++--
> tests/qemu-iotests/062 | 3 ++-
> tests/qemu-iotests/066 | 3 ++-
> tests/qemu-iotests/068 | 3 ++-
> tests/qemu-iotests/098 | 3 +--
> 6 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> index 69d0f9f903..57dda23b02 100755
> --- a/tests/qemu-iotests/036
> +++ b/tests/qemu-iotests/036
> @@ -43,9 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qcow2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto file
> -
> # Only qcow2v3 and later supports feature bits
> -IMGOPTS="compat=1.1"
> +_unsupported_imgopts 'compat=0.10'
>
> echo
> echo === Image with unknown incompatible feature bit ===
> diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
> index b91d8321bb..9c2ef42522 100755
> --- a/tests/qemu-iotests/060
> +++ b/tests/qemu-iotests/060
> @@ -48,6 +48,8 @@ _filter_io_error()
> _supported_fmt qcow2
> _supported_proto file
> _supported_os Linux
> +# These tests only work for compat=1.1 images with refcount_bits=16
> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
>
> rt_offset=65536 # 0x10000 (XXX: just an assumption)
> rb_offset=131072 # 0x20000 (XXX: just an assumption)
> @@ -55,8 +57,6 @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
> l2_offset=262144 # 0x40000 (XXX: just an assumption)
> l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
>
> -IMGOPTS="compat=1.1"
> -
> OPEN_RW="open -o overlap-check=all $TEST_IMG"
> # Overlap checks are done before write operations only, therefore opening an
> # image read-only makes the overlap-check option irrelevant
> diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
> index d5f818fcce..ac0d2a9a3b 100755
> --- a/tests/qemu-iotests/062
> +++ b/tests/qemu-iotests/062
> @@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> +# We need zero clusters and snapshots
> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>
> -IMGOPTS="compat=1.1"
> IMG_SIZE=64M
>
> echo
> diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
> index 28f8c98412..9a15ba8027 100755
> --- a/tests/qemu-iotests/066
> +++ b/tests/qemu-iotests/066
> @@ -39,9 +39,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> +# Weneed zero clusters and snapshots
Typo
> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>
> # Intentionally create an unaligned image
> -IMGOPTS="compat=1.1"
> IMG_SIZE=$((64 * 1024 * 1024 + 512))
>
> echo
> diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
> index 22f5ca3ba6..65650fca9a 100755
> --- a/tests/qemu-iotests/068
> +++ b/tests/qemu-iotests/068
> @@ -39,8 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> +# Internal snapshots are (currently) impossible with refcount_bits=1
Why currently? 1 bit will only allow to mark a cluser as used/unused which
is not enough for any snapshots?
> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>
> -IMGOPTS="compat=1.1"
> IMG_SIZE=128K
>
> case "$QEMU_DEFAULT_MACHINE" in
> diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
> index 1c1d1c468f..2d68dc7d6c 100755
> --- a/tests/qemu-iotests/098
> +++ b/tests/qemu-iotests/098
> @@ -40,8 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -
> -IMGOPTS="compat=1.1"
> +_unsupported_imgopts 'compat=0.10'
Any idea why? I am not familiar with qcow2 well enought to
know but this misses a comment with justification.
>
> for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
>
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 03/18] iotests: Drop compat=1.1 in 050
2019-09-27 9:42 ` [PATCH 03/18] iotests: Drop compat=1.1 in 050 Max Reitz
@ 2019-09-29 16:32 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:32 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> IMGOPTS can never be empty for qcow2, because the check scripts adds
> compat=1.1 unless the user specified any compat option themselves.
> Thus, this block does not do anything and can be dropped.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/050 | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
> index 211fc00797..272ecab195 100755
> --- a/tests/qemu-iotests/050
> +++ b/tests/qemu-iotests/050
> @@ -41,10 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2 qed
> _supported_proto file
>
> -if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
> - IMGOPTS=compat=1.1
> -fi
> -
> echo
> echo "== Creating images =="
>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 04/18] iotests: Let _make_test_img parse its parameters
2019-09-27 9:42 ` [PATCH 04/18] iotests: Let _make_test_img parse its parameters Max Reitz
@ 2019-09-29 16:32 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:32 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> This will allow us to add more options than just -b.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/common.rc | 28 ++++++++++++++++++++--------
> 1 file changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index 12b4751848..3e7adc4834 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -282,12 +282,12 @@ _make_test_img()
> # extra qemu-img options can be added by tests
> # at least one argument (the image size) needs to be added
> local extra_img_options=""
> - local image_size=$*
> local optstr=""
> local img_name=""
> local use_backing=0
> local backing_file=""
> local object_options=""
> + local misc_params=()
>
> if [ -n "$TEST_IMG_FILE" ]; then
> img_name=$TEST_IMG_FILE
> @@ -303,11 +303,23 @@ _make_test_img()
> optstr=$(_optstr_add "$optstr" "key-secret=keysec0")
> fi
>
> - if [ "$1" = "-b" ]; then
> - use_backing=1
> - backing_file=$2
> - image_size=$3
> - fi
> + for param; do
> + if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
> + backing_file=$param
> + continue
> + fi
> +
> + case "$param" in
> + -b)
> + use_backing=1
> + ;;
> +
> + *)
> + misc_params=("${misc_params[@]}" "$param")
> + ;;
> + esac
> + done
> +
> if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
> optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
> fi
> @@ -323,9 +335,9 @@ _make_test_img()
> # XXX(hch): have global image options?
> (
> if [ $use_backing = 1 ]; then
> - $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" $image_size 2>&1
> + $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options -b "$backing_file" "$img_name" "${misc_params[@]}" 2>&1
> else
> - $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" $image_size 2>&1
> + $QEMU_IMG create $object_options -f $IMGFMT $extra_img_options "$img_name" "${misc_params[@]}" 2>&1
> fi
> ) | _filter_img_create
>
Look all right as far as I understand that code, and this is a very welcome change.
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img
2019-09-27 9:42 ` [PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img Max Reitz
@ 2019-09-29 16:32 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:32 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Blindly overriding IMGOPTS is suboptimal as this discards user-specified
> options. Whatever options the test needs should simply be appended.
>
> Some tests do this (with IMGOPTS=$(_optstr_add "$IMGOPTS" "...")), but
> that is cumbersome. It’s simpler to just give _make_test_img an -o
> parameter with which tests can add options.
>
> Some tests actually must override the user-specified options, though,
> for example when creating an image in a different format than the test
> $IMGFMT. For such cases, --no-opts allows clearing the current option
> list.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/common.rc | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index 3e7adc4834..f3784077de 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -287,6 +287,7 @@ _make_test_img()
> local use_backing=0
> local backing_file=""
> local object_options=""
> + local opts_param=false
> local misc_params=()
>
> if [ -n "$TEST_IMG_FILE" ]; then
> @@ -307,6 +308,10 @@ _make_test_img()
> if [ "$use_backing" = "1" -a -z "$backing_file" ]; then
> backing_file=$param
> continue
> + elif $opts_param; then
> + optstr=$(_optstr_add "$optstr" "$param")
> + opts_param=false
> + continue
> fi
>
> case "$param" in
> @@ -314,6 +319,14 @@ _make_test_img()
> use_backing=1
> ;;
>
> + -o)
> + opts_param=true
> + ;;
> +
> + --no-opts)
> + optstr=""
> + ;;
> +
> *)
> misc_params=("${misc_params[@]}" "$param")
> ;;
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051
2019-09-27 9:42 ` [PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
@ 2019-09-29 16:32 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:32 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> It did not matter before, but now that _make_test_img understands -o, we
> should use it properly here.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/051 | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
> index 53bcdbc911..9cd1d60d45 100755
> --- a/tests/qemu-iotests/051
> +++ b/tests/qemu-iotests/051
> @@ -157,7 +157,7 @@ echo
> echo === With version 2 images enabling lazy refcounts must fail ===
> echo
>
> -_make_test_img -ocompat=0.10 $size
> +_make_test_img -o compat=0.10 $size
>
> run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=on
> run_qemu -drive file="$TEST_IMG",format=qcow2,lazy-refcounts=off
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 07/18] iotests: Replace IMGOPTS= by -o
2019-09-27 9:42 ` [PATCH 07/18] iotests: Replace IMGOPTS= by -o Max Reitz
@ 2019-09-29 16:33 ` Maxim Levitsky
2019-09-30 13:00 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:33 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Tests should not overwrite all user-supplied image options, but only add
> to it (which will effectively overwrite conflicting values). Accomplish
> this by passing options to _make_test_img via -o instead of $IMGOPTS.
>
> For some tests, there is no functional change because they already only
> appended options to IMGOPTS. For these, this patch is just a
> simplification.
>
> For others, this is a change, so they now heed user-specified $IMGOPTS.
> Some of those tests do not work with all image options, though, so we
> need to disable them accordingly.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/031 | 9 ++++---
> tests/qemu-iotests/039 | 24 ++++++------------
> tests/qemu-iotests/059 | 18 ++++++-------
> tests/qemu-iotests/060 | 6 ++---
> tests/qemu-iotests/061 | 57 ++++++++++++++++++++++--------------------
> tests/qemu-iotests/079 | 3 +--
> tests/qemu-iotests/106 | 2 +-
> tests/qemu-iotests/108 | 2 +-
> tests/qemu-iotests/112 | 32 ++++++++++++------------
> tests/qemu-iotests/115 | 3 +--
> tests/qemu-iotests/121 | 6 ++---
> tests/qemu-iotests/125 | 2 +-
> tests/qemu-iotests/137 | 2 +-
> tests/qemu-iotests/138 | 3 +--
> tests/qemu-iotests/175 | 2 +-
> tests/qemu-iotests/190 | 2 +-
> tests/qemu-iotests/191 | 3 +--
> tests/qemu-iotests/220 | 4 ++-
> tests/qemu-iotests/243 | 6 +++--
> tests/qemu-iotests/244 | 10 +++++---
> tests/qemu-iotests/250 | 3 +--
> tests/qemu-iotests/265 | 2 +-
> 22 files changed, 100 insertions(+), 101 deletions(-)
>
> diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
> index a3c25ec237..c44fcf91bb 100755
> --- a/tests/qemu-iotests/031
> +++ b/tests/qemu-iotests/031
> @@ -40,19 +40,22 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qcow2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto file
> +# We want to test compat=0.10, which does not support refcount widths
> +# other than 16
> +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
OK
>
> CLUSTER_SIZE=65536
>
> # qcow2.py output depends on the exact options used, so override the command
> # line here as an exception
> -for IMGOPTS in "compat=0.10" "compat=1.1"; do
> +for compat in "compat=0.10" "compat=1.1"; do
>
> echo
> - echo ===== Testing with -o $IMGOPTS =====
> + echo ===== Testing with -o $compat =====
> echo
> echo === Create image with unknown header extension ===
> echo
> - _make_test_img 64M
> + _make_test_img -o $compat 64M
> $PYTHON qcow2.py "$TEST_IMG" add-header-ext 0x12345678 "This is a test header extension"
> $PYTHON qcow2.py "$TEST_IMG" dump-header
> _check_test_img
> diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
> index 325da63a4c..99563bf126 100755
> --- a/tests/qemu-iotests/039
> +++ b/tests/qemu-iotests/039
> @@ -50,8 +50,7 @@ size=128M
> echo
> echo "== Checking that image is clean on shutdown =="
>
> -IMGOPTS="compat=1.1,lazy_refcounts=on"
> -_make_test_img $size
> +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
Any reason for compat=1.1 here? Other that it was before like that.
>
> $QEMU_IO -c "write -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
>
> @@ -62,8 +61,7 @@ _check_test_img
> echo
> echo "== Creating a dirty image file =="
>
> -IMGOPTS="compat=1.1,lazy_refcounts=on"
> -_make_test_img $size
> +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
>
> _NO_VALGRIND \
> $QEMU_IO -c "write -P 0x5a 0 512" \
> @@ -98,8 +96,7 @@ $QEMU_IO -c "read -P 0x5a 0 512" "$TEST_IMG" | _filter_qemu_io
> echo
> echo "== Opening a dirty image read/write should repair it =="
>
> -IMGOPTS="compat=1.1,lazy_refcounts=on"
> -_make_test_img $size
> +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
>
> _NO_VALGRIND \
> $QEMU_IO -c "write -P 0x5a 0 512" \
> @@ -117,8 +114,7 @@ $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
> echo
> echo "== Creating an image file with lazy_refcounts=off =="
>
> -IMGOPTS="compat=1.1,lazy_refcounts=off"
> -_make_test_img $size
> +_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
>
> _NO_VALGRIND \
> $QEMU_IO -c "write -P 0x5a 0 512" \
> @@ -132,11 +128,9 @@ _check_test_img
> echo
> echo "== Committing to a backing file with lazy_refcounts=on =="
>
> -IMGOPTS="compat=1.1,lazy_refcounts=on"
> -TEST_IMG="$TEST_IMG".base _make_test_img $size
> +TEST_IMG="$TEST_IMG".base _make_test_img -o "compat=1.1,lazy_refcounts=on" $size
>
> -IMGOPTS="compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base"
> -_make_test_img $size
> +_make_test_img -o "compat=1.1,lazy_refcounts=on,backing_file=$TEST_IMG.base" $size
>
> $QEMU_IO -c "write 0 512" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IMG commit "$TEST_IMG"
> @@ -151,8 +145,7 @@ TEST_IMG="$TEST_IMG".base _check_test_img
> echo
> echo "== Changing lazy_refcounts setting at runtime =="
>
> -IMGOPTS="compat=1.1,lazy_refcounts=off"
> -_make_test_img $size
> +_make_test_img -o "compat=1.1,lazy_refcounts=off" $size
>
> _NO_VALGRIND \
> $QEMU_IO -c "reopen -o lazy-refcounts=on" \
> @@ -164,8 +157,7 @@ $QEMU_IO -c "reopen -o lazy-refcounts=on" \
> $PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
> _check_test_img
>
> -IMGOPTS="compat=1.1,lazy_refcounts=on"
> -_make_test_img $size
> +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
>
> _NO_VALGRIND \
> $QEMU_IO -c "reopen -o lazy-refcounts=off" \
> diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
> index 10bfbaecec..3941c3f0c2 100755
> --- a/tests/qemu-iotests/059
> +++ b/tests/qemu-iotests/059
> @@ -70,18 +70,18 @@ poke_file "$TEST_IMG" "$grain_table_size_offset" "\x01\x00\x00\x00"
>
> echo
> echo "=== Testing monolithicFlat creation and opening ==="
> -IMGOPTS="subformat=monolithicFlat" _make_test_img 2G
> +_make_test_img -o "subformat=monolithicFlat" 2G
> _img_info
> _cleanup_test_img
>
> echo
> echo "=== Testing monolithicFlat with zeroed_grain ==="
> -IMGOPTS="subformat=monolithicFlat,zeroed_grain=on" _make_test_img 2G
> +_make_test_img -o "subformat=monolithicFlat,zeroed_grain=on" 2G
> _cleanup_test_img
>
> echo
> echo "=== Testing big twoGbMaxExtentFlat ==="
> -IMGOPTS="subformat=twoGbMaxExtentFlat" _make_test_img 1000G
> +_make_test_img -o "subformat=twoGbMaxExtentFlat" 1000G
> $QEMU_IMG info $TEST_IMG | _filter_testdir | sed -e 's/cid: [0-9]*/cid: XXXXXXXX/'
> _cleanup_test_img
>
> @@ -101,13 +101,13 @@ _img_info
>
> echo
> echo "=== Testing truncated sparse ==="
> -IMGOPTS="subformat=monolithicSparse" _make_test_img 100G
> +_make_test_img -o "subformat=monolithicSparse" 100G
> truncate -s 10M $TEST_IMG
> _img_info
>
> echo
> echo "=== Converting to streamOptimized from image with small cluster size==="
> -TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 IMGOPTS="cluster_size=4096" _make_test_img 1G
> +TEST_IMG="$TEST_IMG.qcow2" IMGFMT=qcow2 _make_test_img -o "cluster_size=4096" 1G
> $QEMU_IO -f qcow2 -c "write -P 0xa 0 512" "$TEST_IMG.qcow2" | _filter_qemu_io
> $QEMU_IO -f qcow2 -c "write -P 0xb 10240 512" "$TEST_IMG.qcow2" | _filter_qemu_io
> $QEMU_IMG convert -f qcow2 -O vmdk -o subformat=streamOptimized "$TEST_IMG.qcow2" "$TEST_IMG" 2>&1
> @@ -117,7 +117,7 @@ echo "=== Testing monolithicFlat with internally generated JSON file name ==="
>
> echo '--- blkdebug ---'
> # Should work, because bdrv_dirname() works fine with blkdebug
> -IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
> +_make_test_img -o "subformat=monolithicFlat" 64M
> $QEMU_IO -c "open -o driver=$IMGFMT,file.driver=blkdebug,file.image.filename=$TEST_IMG,file.inject-error.0.event=read_aio" \
> -c info \
> 2>&1 \
> @@ -126,7 +126,7 @@ _cleanup_test_img
>
> echo '--- quorum ---'
> # Should not work, because bdrv_dirname() does not work with quorum
> -IMGOPTS="subformat=monolithicFlat" _make_test_img 64M
> +_make_test_img -o "subformat=monolithicFlat" 64M
> cp "$TEST_IMG" "$TEST_IMG.orig"
>
> filename="json:{
> @@ -161,7 +161,7 @@ _cleanup_test_img
>
> echo
> echo "=== Testing 4TB monolithicFlat creation and IO ==="
> -IMGOPTS="subformat=monolithicFlat" _make_test_img 4T
> +_make_test_img -o "subformat=monolithicFlat" 4T
> _img_info
> $QEMU_IO -c "write -P 0xa 900G 512" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IO -c "read -v 900G 1024" "$TEST_IMG" | _filter_qemu_io
> @@ -170,7 +170,7 @@ _cleanup_test_img
> echo
> echo "=== Testing qemu-img map on extents ==="
> for fmt in monolithicSparse twoGbMaxExtentSparse; do
> - IMGOPTS="subformat=$fmt" _make_test_img 31G
> + _make_test_img -o "subformat=$fmt" 31G
> $QEMU_IO -c "write 65024 1k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IO -c "write 2147483136 1k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IO -c "write 5G 1k" "$TEST_IMG" | _filter_qemu_io
> diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
> index 9c2ef42522..92243c2edd 100755
> --- a/tests/qemu-iotests/060
> +++ b/tests/qemu-iotests/060
> @@ -158,7 +158,7 @@ $QEMU_IO -c 'write 0k 64k' "$BACKING_IMG" | _filter_qemu_io
> # compat=0.10 is required in order to make the following discard actually
> # unallocate the sector rather than make it a zero sector - we want COW, after
> # all.
> -IMGOPTS='compat=0.10' _make_test_img -b "$BACKING_IMG" 1G
> +_make_test_img -o 'compat=0.10' -b "$BACKING_IMG" 1G
> # Write two clusters, the second one enforces creation of an L2 table after
> # the first data cluster.
> $QEMU_IO -c 'write 0k 64k' -c 'write 512M 64k' "$TEST_IMG" | _filter_qemu_io
> @@ -398,7 +398,7 @@ echo
> echo "=== Discarding a non-covered in-bounds refblock ==="
> echo
>
> -IMGOPTS='refcount_bits=1' _make_test_img 64M
> +_make_test_img -o 'refcount_bits=1' 64M
>
> # Pretend there's a refblock somewhere where there is no refblock to
> # cover it (but the covering refblock has a valid index in the
> @@ -422,7 +422,7 @@ echo
> echo "=== Discarding a refblock covered by an unaligned refblock ==="
> echo
>
> -IMGOPTS='refcount_bits=1' _make_test_img 64M
> +_make_test_img -o 'refcount_bits=1' 64M
>
> # Same as above
> poke_file "$TEST_IMG" "$(($rt_offset+8))" "\x00\x00\x00\x10\x00\x00\x00\x00"
> diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
> index 4eac5b83bd..0480be0141 100755
> --- a/tests/qemu-iotests/061
> +++ b/tests/qemu-iotests/061
> @@ -41,11 +41,14 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto file
> _supported_os Linux
> +# Conversion between different compat versions can only really work
> +# with refcount_bits=16
> +_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
>
> echo
> echo "=== Testing version downgrade with zero expansion ==="
> echo
> -IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
> +_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
> $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
> $PYTHON qcow2.py "$TEST_IMG" dump-header
> $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
> @@ -56,7 +59,7 @@ _check_test_img
> echo
> echo "=== Testing version downgrade with zero expansion and 4K cache entries ==="
> echo
> -IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
> +_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
> $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IO -c "write -z 32M 128k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IO -c map "$TEST_IMG" | _filter_qemu_io
> @@ -72,7 +75,7 @@ _check_test_img
> echo
> echo "=== Testing dirty version downgrade ==="
> echo
> -IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
> +_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
> _NO_VALGRIND \
> $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
> -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
> @@ -85,7 +88,7 @@ _check_test_img
> echo
> echo "=== Testing version downgrade with unknown compat/autoclear flags ==="
> echo
> -IMGOPTS="compat=1.1" _make_test_img 64M
> +_make_test_img -o "compat=1.1" 64M
> $PYTHON qcow2.py "$TEST_IMG" set-feature-bit compatible 42
> $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 42
> $PYTHON qcow2.py "$TEST_IMG" dump-header
> @@ -96,7 +99,7 @@ _check_test_img
> echo
> echo "=== Testing version upgrade and resize ==="
> echo
> -IMGOPTS="compat=0.10" _make_test_img 64M
> +_make_test_img -o "compat=0.10" 64M
> $QEMU_IO -c "write -P 0x2a 42M 64k" "$TEST_IMG" | _filter_qemu_io
> $PYTHON qcow2.py "$TEST_IMG" dump-header
> $QEMU_IMG amend -o "compat=1.1,lazy_refcounts=on,size=128M" "$TEST_IMG"
> @@ -107,7 +110,7 @@ _check_test_img
> echo
> echo "=== Testing dirty lazy_refcounts=off ==="
> echo
> -IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
> +_make_test_img -o "compat=1.1,lazy_refcounts=on" 64M
> _NO_VALGRIND \
> $QEMU_IO -c "write -P 0x2a 0 128k" -c flush \
> -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 | _filter_qemu_io
> @@ -120,8 +123,8 @@ _check_test_img
> echo
> echo "=== Testing backing file ==="
> echo
> -IMGOPTS="compat=1.1" _make_test_img 64M
> -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> +_make_test_img -o "compat=1.1" 64M
> +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
> $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
> $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IMG amend -o "backing_file=$TEST_IMG.base,backing_fmt=qcow2" "$TEST_IMG"
> @@ -131,7 +134,7 @@ _check_test_img
> echo
> echo "=== Testing invalid configurations ==="
> echo
> -IMGOPTS="compat=0.10" _make_test_img 64M
> +_make_test_img -o "compat=0.10" 64M
> $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
> $QEMU_IMG amend -o "compat=1.1" "$TEST_IMG" # actually valid
> $QEMU_IMG amend -o "compat=0.10,lazy_refcounts=on" "$TEST_IMG"
> @@ -144,7 +147,7 @@ $QEMU_IMG amend -o "preallocation=on" "$TEST_IMG"
> echo
> echo "=== Testing correct handling of unset value ==="
> echo
> -IMGOPTS="compat=1.1,cluster_size=1k" _make_test_img 64M
> +_make_test_img -o "compat=1.1,cluster_size=1k" 64M
> echo "Should work:"
> $QEMU_IMG amend -o "lazy_refcounts=on" "$TEST_IMG"
> echo "Should not work:" # Just to know which of these tests actually fails
> @@ -153,7 +156,7 @@ $QEMU_IMG amend -o "cluster_size=64k" "$TEST_IMG"
> echo
> echo "=== Testing zero expansion on inactive clusters ==="
> echo
> -IMGOPTS="compat=1.1" _make_test_img 64M
> +_make_test_img -o "compat=1.1" 64M
> $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IMG snapshot -c foo "$TEST_IMG"
> $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG" | _filter_qemu_io
> @@ -167,7 +170,7 @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
> echo
> echo "=== Testing zero expansion on shared L2 table ==="
> echo
> -IMGOPTS="compat=1.1" _make_test_img 64M
> +_make_test_img -o "compat=1.1" 64M
> $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IMG snapshot -c foo "$TEST_IMG"
> $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
> @@ -180,9 +183,9 @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
> echo
> echo "=== Testing zero expansion on backed image ==="
> echo
> -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
> $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
> -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
> +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
> $QEMU_IO -c "read -P 0x2a 0 128k" -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
> _check_test_img
> @@ -191,9 +194,9 @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
> echo
> echo "=== Testing zero expansion on backed inactive clusters ==="
> echo
> -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
> $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
> -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
> +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
> $QEMU_IO -c "write -z 0 64k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IMG snapshot -c foo "$TEST_IMG"
> $QEMU_IO -c "write -P 0x42 0 128k" "$TEST_IMG" | _filter_qemu_io
> @@ -207,9 +210,9 @@ $QEMU_IO -c "read -P 0 0 64k" -c "read -P 0x2a 64k 64k" "$TEST_IMG" | _filter_qe
> echo
> echo "=== Testing zero expansion on backed image with shared L2 table ==="
> echo
> -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 64M
> $QEMU_IO -c "write -P 0x2a 0 128k" "$TEST_IMG.base" | _filter_qemu_io
> -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 64M
> +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 64M
> $QEMU_IO -c "write -z 0 128k" "$TEST_IMG" | _filter_qemu_io
> $QEMU_IMG snapshot -c foo "$TEST_IMG"
> $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
> @@ -222,7 +225,7 @@ $QEMU_IO -c "read -P 0 0 128k" "$TEST_IMG" | _filter_qemu_io
> echo
> echo "=== Testing preallocated zero expansion on full image ==="
> echo
> -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG" _make_test_img 64M
> +TEST_IMG="$TEST_IMG" _make_test_img -o "compat=1.1" 64M
> $QEMU_IO -c "write -P 0x2a 0 64M" "$TEST_IMG" -c "write -z 0 64M" | _filter_qemu_io
> $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
> _check_test_img
> @@ -231,8 +234,8 @@ $QEMU_IO -c "read -P 0 0 64M" "$TEST_IMG" | _filter_qemu_io
> echo
> echo "=== Testing progress report without snapshot ==="
> echo
> -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
> -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
> +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
> +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
> $QEMU_IO -c "write -z 0 64k" \
> -c "write -z 1G 64k" \
> -c "write -z 2G 64k" \
> @@ -243,8 +246,8 @@ _check_test_img
> echo
> echo "=== Testing progress report with snapshot ==="
> echo
> -IMGOPTS="compat=1.1" TEST_IMG="$TEST_IMG.base" _make_test_img 4G
> -IMGOPTS="compat=1.1" _make_test_img -b "$TEST_IMG.base" 4G
> +TEST_IMG="$TEST_IMG.base" _make_test_img -o "compat=1.1" 4G
> +_make_test_img -o "compat=1.1" -b "$TEST_IMG.base" 4G
> $QEMU_IO -c "write -z 0 64k" \
> -c "write -z 1G 64k" \
> -c "write -z 2G 64k" \
> @@ -256,7 +259,7 @@ _check_test_img
> echo
> echo "=== Testing version downgrade with external data file ==="
> echo
> -IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
> +_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
> $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
> _img_info --format-specific
> _check_test_img
> @@ -264,11 +267,11 @@ _check_test_img
> echo
> echo "=== Try changing the external data file ==="
> echo
> -IMGOPTS="compat=1.1" _make_test_img 64M
> +_make_test_img -o "compat=1.1" 64M
> $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
>
> echo
> -IMGOPTS="compat=1.1,data_file=$TEST_IMG.data" _make_test_img 64M
> +_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data" 64M
> $QEMU_IMG amend -o "data_file=foo" "$TEST_IMG"
> _img_info --format-specific
> TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info --format-specific --image-opts
> @@ -281,7 +284,7 @@ TEST_IMG="data-file.filename=$TEST_IMG.data,file.filename=$TEST_IMG" _img_info -
> echo
> echo "=== Clearing and setting data-file-raw ==="
> echo
> -IMGOPTS="compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
> +_make_test_img -o "compat=1.1,data_file=$TEST_IMG.data,data_file_raw=on" 64M
> $QEMU_IMG amend -o "data_file_raw=on" "$TEST_IMG"
> _img_info --format-specific
> _check_test_img
> diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
> index 81f0c21f53..162355b29a 100755
> --- a/tests/qemu-iotests/079
> +++ b/tests/qemu-iotests/079
> @@ -44,8 +44,7 @@ echo
> cluster_sizes="16384 32768 65536 131072 262144 524288 1048576 2097152 4194304"
>
> for s in $cluster_sizes; do
> - IMGOPTS=$(_optstr_add "$IMGOPTS" "preallocation=metadata,cluster_size=$s") \
> - _make_test_img 4G
> + _make_test_img -o "preallocation=metadata,cluster_size=$s" 4G
> done
>
> # success, all done
> diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106
> index ac47eaa0f5..b5d1ec4078 100755
> --- a/tests/qemu-iotests/106
> +++ b/tests/qemu-iotests/106
> @@ -51,7 +51,7 @@ for create_mode in off falloc full; do
> echo
> echo "--- create_mode=$create_mode growth_mode=$growth_mode ---"
>
> - IMGOPTS="preallocation=$create_mode" _make_test_img ${CREATION_SIZE}K
> + _make_test_img -o "preallocation=$create_mode" ${CREATION_SIZE}K
> $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
>
> expected_size=0
> diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
> index 9c08172237..b0a6ae597b 100755
> --- a/tests/qemu-iotests/108
> +++ b/tests/qemu-iotests/108
> @@ -65,7 +65,7 @@ echo
> echo '=== Repairing unreferenced data cluster in new refblock area ==='
> echo
>
> -IMGOPTS='cluster_size=512' _make_test_img 64M
> +_make_test_img -o 'cluster_size=512' 64M
> # Allocate the first 128 kB in the image (first refblock)
> $QEMU_IO -c 'write 0 0x1b200' "$TEST_IMG" | _filter_qemu_io
> # should be 131072 == 0x20000
> diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
> index 706c10b600..6850225939 100755
> --- a/tests/qemu-iotests/112
> +++ b/tests/qemu-iotests/112
> @@ -53,20 +53,20 @@ echo '=== refcount_bits limits ==='
> echo
>
> # Must be positive (non-zero)
> -IMGOPTS="$IMGOPTS,refcount_bits=0" _make_test_img 64M
> +_make_test_img -o "refcount_bits=0" 64M
> # Must be positive (non-negative)
> -IMGOPTS="$IMGOPTS,refcount_bits=-1" _make_test_img 64M
> +_make_test_img -o "refcount_bits=-1" 64M
> # May not exceed 64
> -IMGOPTS="$IMGOPTS,refcount_bits=128" _make_test_img 64M
> +_make_test_img -o "refcount_bits=128" 64M
> # Must be a power of two
> -IMGOPTS="$IMGOPTS,refcount_bits=42" _make_test_img 64M
> +_make_test_img -o "refcount_bits=42" 64M
>
> # 1 is the minimum
> -IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
> +_make_test_img -o "refcount_bits=1" 64M
> print_refcount_bits
>
> # 64 is the maximum
> -IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
> +_make_test_img -o "refcount_bits=64" 64M
> print_refcount_bits
>
> # 16 is the default
> @@ -78,19 +78,19 @@ echo '=== refcount_bits and compat=0.10 ==='
> echo
>
> # Should work
> -IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=16" _make_test_img 64M
> +_make_test_img -o "compat=0.10,refcount_bits=16" 64M
> print_refcount_bits
>
> # Should not work
> -IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=1" _make_test_img 64M
> -IMGOPTS="$IMGOPTS,compat=0.10,refcount_bits=64" _make_test_img 64M
> +_make_test_img -o "compat=0.10,refcount_bits=1" 64M
> +_make_test_img -o "compat=0.10,refcount_bits=64" 64M
>
>
> echo
> echo '=== Snapshot limit on refcount_bits=1 ==='
> echo
>
> -IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
> +_make_test_img -o "refcount_bits=1" 64M
> print_refcount_bits
>
> $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
> @@ -106,7 +106,7 @@ echo
> echo '=== Snapshot limit on refcount_bits=2 ==='
> echo
>
> -IMGOPTS="$IMGOPTS,refcount_bits=2" _make_test_img 64M
> +_make_test_img -o "refcount_bits=2" 64M
> print_refcount_bits
>
> $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
> @@ -124,7 +124,7 @@ echo
> echo '=== Compressed clusters with refcount_bits=1 ==='
> echo
>
> -IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
> +_make_test_img -o "refcount_bits=1" 64M
> print_refcount_bits
>
> # Both should fit into a single host cluster; instead of failing to increase the
> @@ -140,7 +140,7 @@ echo
> echo '=== MSb set in 64 bit refcount ==='
> echo
>
> -IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
> +_make_test_img -o "refcount_bits=64" 64M
> print_refcount_bits
>
> $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
> @@ -158,7 +158,7 @@ echo
> echo '=== Snapshot on maximum 64 bit refcount value ==='
> echo
>
> -IMGOPTS="$IMGOPTS,refcount_bits=64" _make_test_img 64M
> +_make_test_img -o "refcount_bits=64" 64M
> print_refcount_bits
>
> $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
> @@ -239,7 +239,7 @@ echo
> echo '=== Testing too many references for check ==='
> echo
>
> -IMGOPTS="$IMGOPTS,refcount_bits=1" _make_test_img 64M
> +_make_test_img -o "refcount_bits=1" 64M
> print_refcount_bits
>
> # This cluster should be created at 0x50000
> @@ -262,7 +262,7 @@ echo
> echo '=== Multiple walks necessary during amend ==='
> echo
>
> -IMGOPTS="$IMGOPTS,refcount_bits=1,cluster_size=512" _make_test_img 64k
> +_make_test_img -o "refcount_bits=1,cluster_size=512" 64k
>
> # Cluster 0 is the image header, clusters 1 to 4 are used by the L1 table, a
> # single L2 table, the reftable and a single refblock. This creates 58 data
> diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
> index 9ed3cb6a83..d254b18342 100755
> --- a/tests/qemu-iotests/115
> +++ b/tests/qemu-iotests/115
> @@ -64,8 +64,7 @@ echo
> # least 256 MB. We can achieve that by using preallocation=metadata for an image
> # which has a guest disk size of 256 MB.
>
> -IMGOPTS="$IMGOPTS,refcount_bits=64,cluster_size=512,preallocation=metadata" \
> - _make_test_img 256M
> +_make_test_img -o "refcount_bits=64,cluster_size=512,preallocation=metadata" 256M
>
> # We know for sure that the L1 and refcount tables do not overlap with any other
> # structure because the metadata overlap checks would have caught that case.
> diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
> index 90a0424edb..10db813d94 100755
> --- a/tests/qemu-iotests/121
> +++ b/tests/qemu-iotests/121
> @@ -50,7 +50,7 @@ echo
> # Preallocation speeds up the write operation, but preallocating everything will
> # destroy the purpose of the write; so preallocate one KB less than what would
> # cause a reftable growth...
> -IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64512K
> +_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64512K
> # ...and make the image the desired size afterwards.
> $QEMU_IMG resize "$TEST_IMG" 65M
>
> @@ -73,7 +73,7 @@ echo
> echo '--- Test 2 ---'
> echo
>
> -IMGOPTS='preallocation=metadata,cluster_size=1k' _make_test_img 64513K
> +_make_test_img -o 'preallocation=metadata,cluster_size=1k' 64513K
> # This results in an L1 table growth which in turn results in some clusters at
> # the start of the image becoming free
> $QEMU_IMG resize "$TEST_IMG" 65M
> @@ -96,7 +96,7 @@ echo
> echo '=== Allocating a new refcount block must not leave holes in the image ==='
> echo
>
> -IMGOPTS='cluster_size=512,refcount_bits=16' _make_test_img 1M
> +_make_test_img -o 'cluster_size=512,refcount_bits=16' 1M
>
> # This results in an image with 256 used clusters: the qcow2 header,
> # the refcount table, one refcount block, the L1 table, four L2 tables
> diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
> index 4e31aa4e5f..d510984045 100755
> --- a/tests/qemu-iotests/125
> +++ b/tests/qemu-iotests/125
> @@ -114,7 +114,7 @@ for GROWTH_SIZE in 16 48 80; do
> for growth_mode in off metadata falloc full; do
> echo "--- cluster_size=$cluster_size growth_size=$GROWTH_SIZE create_mode=$create_mode growth_mode=$growth_mode ---"
>
> - IMGOPTS="preallocation=$create_mode,cluster_size=$cluster_size" _make_test_img ${CREATION_SIZE}
> + _make_test_img -o "preallocation=$create_mode,cluster_size=$cluster_size" ${CREATION_SIZE}
> $QEMU_IMG resize -f "$IMGFMT" --preallocation=$growth_mode "$TEST_IMG" +${GROWTH_SIZE}K
>
> host_size_0=$(get_image_size_on_host)
> diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
> index 089821da0c..6cf2997577 100755
> --- a/tests/qemu-iotests/137
> +++ b/tests/qemu-iotests/137
> @@ -117,7 +117,7 @@ $QEMU_IO \
> -c "reopen -o cache-clean-interval=-1" \
> "$TEST_IMG" | _filter_qemu_io
>
> -IMGOPTS="cluster_size=256k" _make_test_img 32P
> +_make_test_img -o "cluster_size=256k" 32P
> $QEMU_IO \
> -c "reopen -o l2-cache-entry-size=512,l2-cache-size=1T" \
> "$TEST_IMG" | _filter_qemu_io
> diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
> index 6a731370db..66ae9d5e78 100755
> --- a/tests/qemu-iotests/138
> +++ b/tests/qemu-iotests/138
> @@ -45,8 +45,7 @@ echo
> echo '=== Check on an image with a multiple of 2^32 clusters ==='
> echo
>
> -IMGOPTS=$(_optstr_add "$IMGOPTS" "cluster_size=512") \
> - _make_test_img 512
> +_make_test_img -o "cluster_size=512" 512
>
> # Allocate L2 table
> $QEMU_IO -c 'write 0 512' "$TEST_IMG" | _filter_qemu_io
> diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
> index 55db2803ed..020ed8e61f 100755
> --- a/tests/qemu-iotests/175
> +++ b/tests/qemu-iotests/175
> @@ -95,7 +95,7 @@ stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_block
> for mode in off full falloc; do
> echo
> echo "== creating image with preallocation $mode =="
> - IMGOPTS=preallocation=$mode _make_test_img $size | _filter_imgfmt
> + _make_test_img -o preallocation=$mode $size | _filter_imgfmt
> stat -c "size=%s, blocks=%b" $TEST_IMG | _filter_blocks $extra_blocks $min_blocks $size
> done
>
> diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
> index eb766ad09f..5890ff9cfc 100755
> --- a/tests/qemu-iotests/190
> +++ b/tests/qemu-iotests/190
> @@ -45,7 +45,7 @@ _supported_proto file
> echo "== Huge file =="
> echo
>
> -IMGOPTS='cluster_size=2M' _make_test_img 2T
> +_make_test_img -o 'cluster_size=2M' 2T
>
> $QEMU_IMG measure -O raw -f qcow2 "$TEST_IMG"
> $QEMU_IMG measure -O qcow2 -o cluster_size=64k -f qcow2 "$TEST_IMG"
> diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
> index 528022e8d8..21c16a32cb 100755
> --- a/tests/qemu-iotests/191
> +++ b/tests/qemu-iotests/191
> @@ -51,8 +51,7 @@ echo === Preparing and starting VM ===
> echo
>
> TEST_IMG="${TEST_IMG}.base" _make_test_img $size
> -IMGOPTS=$(_optstr_add "$IMGOPTS" "backing_fmt=$IMGFMT") \
> - TEST_IMG="${TEST_IMG}.mid" _make_test_img -b "${TEST_IMG}.base"
> +TEST_IMG="${TEST_IMG}.mid" _make_test_img -o "backing_fmt=$IMGFMT" -b "${TEST_IMG}.base"
> _make_test_img -b "${TEST_IMG}.mid"
> TEST_IMG="${TEST_IMG}.ovl2" _make_test_img -b "${TEST_IMG}.mid"
>
> diff --git a/tests/qemu-iotests/220 b/tests/qemu-iotests/220
> index 2d62c5dcac..3769f372cb 100755
> --- a/tests/qemu-iotests/220
> +++ b/tests/qemu-iotests/220
> @@ -37,6 +37,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto file
> _supported_os Linux
> +# To use a different refcount width but 16 bits we need compat=1.1
> +_unsupported_imgopts 'compat=0.10'
>
> echo "== Creating huge file =="
>
> @@ -46,7 +48,7 @@ if ! truncate --size=513T "$TEST_IMG"; then
> _notrun "file system on $TEST_DIR does not support large enough files"
> fi
> rm "$TEST_IMG"
> -IMGOPTS='cluster_size=2M,refcount_bits=1' _make_test_img 513T
> +_make_test_img -o 'cluster_size=2M,refcount_bits=1' 513T
>
> echo "== Populating refcounts =="
> # We want an image with 256M refcounts * 2M clusters = 512T referenced.
> diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
> index e563761307..2b84b896db 100755
> --- a/tests/qemu-iotests/243
> +++ b/tests/qemu-iotests/243
> @@ -40,6 +40,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto file
> _supported_os Linux
> +# External data files do not work with compat=0.10
> +_unsupported_imgopts 'compat=0.10'
>
> for mode in off metadata falloc full; do
>
> @@ -47,7 +49,7 @@ for mode in off metadata falloc full; do
> echo "=== preallocation=$mode ==="
> echo
>
> - IMGOPTS="preallocation=$mode" _make_test_img 64M
> + _make_test_img -o "preallocation=$mode" 64M
>
> printf "File size: "
> du -b $TEST_IMG | cut -f1
> @@ -64,7 +66,7 @@ for mode in off metadata falloc full; do
> echo "=== External data file: preallocation=$mode ==="
> echo
>
> - IMGOPTS="data_file=$TEST_IMG.data,preallocation=$mode" _make_test_img 64M
> + _make_test_img -o "data_file=$TEST_IMG.data,preallocation=$mode" 64M
>
> echo -n "qcow2 file size: "
> du -b $TEST_IMG | cut -f1
> diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
> index 13978f93d2..0375bc12d4 100755
> --- a/tests/qemu-iotests/244
> +++ b/tests/qemu-iotests/244
> @@ -41,13 +41,15 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto file
> _supported_os Linux
> +# External data files do not work with compat=0.10
> +_unsupported_imgopts 'compat=0.10'
>
> echo
> echo "=== Create and open image with external data file ==="
> echo
>
> echo "With data file name in the image:"
> -IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
> +_make_test_img -o "data_file=$TEST_IMG.data" 64M
> _check_test_img
>
> $QEMU_IO -c "open $TEST_IMG" -c "read -P 0 0 64k" 2>&1 | _filter_qemu_io | _filter_testdir
> @@ -104,7 +106,7 @@ echo
> echo "=== Standalone image with external data file (efficient) ==="
> echo
>
> -IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
> +_make_test_img -o "data_file=$TEST_IMG.data" 64M
>
> echo -n "qcow2 file size before I/O: "
> du -b $TEST_IMG | cut -f1
> @@ -154,7 +156,7 @@ echo
> echo "=== Standalone image with external data file (valid raw) ==="
> echo
>
> -IMGOPTS="data_file=$TEST_IMG.data,data_file_raw=on" _make_test_img 64M
> +_make_test_img -o "data_file=$TEST_IMG.data,data_file_raw=on" 64M
>
> echo -n "qcow2 file size before I/O: "
> du -b $TEST_IMG | cut -f1
> @@ -187,7 +189,7 @@ echo
> echo "=== bdrv_co_block_status test for file and offset=0 ==="
> echo
>
> -IMGOPTS="data_file=$TEST_IMG.data" _make_test_img 64M
> +_make_test_img -o "data_file=$TEST_IMG.data" 64M
>
> $QEMU_IO -c 'write -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
> $QEMU_IO -c 'read -P 0x11 0 1M' -f $IMGFMT "$TEST_IMG" | _filter_qemu_io
> diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
> index c9c0a84a5a..670cf19076 100755
> --- a/tests/qemu-iotests/250
> +++ b/tests/qemu-iotests/250
> @@ -55,9 +55,8 @@ disk_usage()
> }
>
> size=2100M
> -IMGOPTS="cluster_size=1M,preallocation=metadata"
>
> -_make_test_img $size
> +_make_test_img -o "cluster_size=1M,preallocation=metadata" $size
> $QEMU_IO -c 'discard 0 10M' -c 'discard 2090M 10M' \
> -c 'write 2090M 10M' -c 'write 0 10M' "$TEST_IMG" | _filter_qemu_io
>
> diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265
> index dce6f77be3..00f2ec769e 100755
> --- a/tests/qemu-iotests/265
> +++ b/tests/qemu-iotests/265
> @@ -41,7 +41,7 @@ _supported_os Linux
> echo '--- Writing to the image ---'
>
> # Reduce cluster size so we get more and quicker I/O
> -IMGOPTS='cluster_size=4096' _make_test_img 1M
> +_make_test_img -o 'cluster_size=4096' 1M
> (for ((kb = 1024 - 4; kb >= 0; kb -= 4)); do \
> echo "aio_write -P 42 $((kb + 1))k 2k"; \
> done) \
Looks all right, but the patch is large, and I might have missed something.
I don't know the iotests well enough to be sure.
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts
2019-09-27 9:42 ` [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
@ 2019-09-29 16:33 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:33 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/071 | 4 ++--
> tests/qemu-iotests/174 | 2 +-
> tests/qemu-iotests/178 | 4 ++--
> tests/qemu-iotests/197 | 4 ++--
> tests/qemu-iotests/215 | 4 ++--
> 5 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
> index fab526666b..4e31943244 100755
> --- a/tests/qemu-iotests/071
> +++ b/tests/qemu-iotests/071
> @@ -58,7 +58,7 @@ echo
> echo "=== Testing blkverify through filename ==="
> echo
>
> -TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
> +TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
> _filter_imgfmt
> _make_test_img $IMG_SIZE
> $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base $TEST_IMG" \
> @@ -73,7 +73,7 @@ echo
> echo "=== Testing blkverify through file blockref ==="
> echo
>
> -TEST_IMG="$TEST_IMG.base" IMGOPTS="" IMGFMT="raw" _make_test_img $IMG_SIZE |\
> +TEST_IMG="$TEST_IMG.base" IMGFMT="raw" _make_test_img --no-opts $IMG_SIZE |\
> _filter_imgfmt
> _make_test_img $IMG_SIZE
> $QEMU_IO -c "open -o driver=raw,file.driver=blkverify,file.raw.filename=$TEST_IMG.base,file.test.driver=$IMGFMT,file.test.file.filename=$TEST_IMG" \
> diff --git a/tests/qemu-iotests/174 b/tests/qemu-iotests/174
> index 0a952a73fd..e2f14a38c6 100755
> --- a/tests/qemu-iotests/174
> +++ b/tests/qemu-iotests/174
> @@ -40,7 +40,7 @@ _unsupported_fmt raw
>
>
> size=256K
> -IMGFMT=raw IMGKEYSECRET= IMGOPTS= _make_test_img $size | _filter_imgfmt
> +IMGFMT=raw IMGKEYSECRET= _make_test_img --no-opts $size | _filter_imgfmt
>
> echo
> echo "== reading wrong format should fail =="
> diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
> index 21231cadd3..75b5e8f314 100755
> --- a/tests/qemu-iotests/178
> +++ b/tests/qemu-iotests/178
> @@ -62,8 +62,8 @@ $QEMU_IMG measure -O foo "$TEST_IMG" # unknown image file format
>
> make_test_img_with_fmt() {
> # Shadow global variables within this function
> - local IMGFMT="$1" IMGOPTS=""
> - _make_test_img "$2"
> + local IMGFMT="$1"
> + _make_test_img --no-opts "$2"
> }
>
> qemu_io_with_fmt() {
> diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
> index 1d4f6786db..4d3d08ad6f 100755
> --- a/tests/qemu-iotests/197
> +++ b/tests/qemu-iotests/197
> @@ -66,8 +66,8 @@ if [ "$IMGFMT" = "vpc" ]; then
> fi
> _make_test_img 4G
> $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
> -IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
> - _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
> +IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
> + _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
> $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
>
> # Ensure that a read of two clusters, but where one is already allocated,
> diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
> index 2eb377d682..55a1874dcd 100755
> --- a/tests/qemu-iotests/215
> +++ b/tests/qemu-iotests/215
> @@ -63,8 +63,8 @@ if [ "$IMGFMT" = "vpc" ]; then
> fi
> _make_test_img 4G
> $QEMU_IO -c "write -P 55 3G 1k" "$TEST_IMG" | _filter_qemu_io
> -IMGPROTO=file IMGFMT=qcow2 IMGOPTS= TEST_IMG_FILE="$TEST_WRAP" \
> - _make_test_img -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
> +IMGPROTO=file IMGFMT=qcow2 TEST_IMG_FILE="$TEST_WRAP" \
> + _make_test_img --no-opts -F "$IMGFMT" -b "$TEST_IMG" | _filter_img_create
> $QEMU_IO -f qcow2 -c "write -z -u 1M 64k" "$TEST_WRAP" | _filter_qemu_io
>
> # Ensure that a read of two clusters, but where one is already allocated,
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267
2019-09-27 9:42 ` [PATCH 09/18] iotests: Drop IMGOPTS use in 267 Max Reitz
@ 2019-09-29 16:33 ` Maxim Levitsky
2019-09-30 13:01 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:33 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +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 <mreitz@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 95f885442f..529f5f9afe 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
qemu's master (pulled today), don't have iotest 267,
you probably based this on some not yet merged branch.
Or I made some mistake with pulling the master branch.
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 10/18] iotests: Avoid qemu-img create
2019-09-27 9:42 ` [PATCH 10/18] iotests: Avoid qemu-img create Max Reitz
@ 2019-09-29 16:33 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:33 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Use _make_test_img whenever possible. This way, we will not ignore
> user-specified image options.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/094 | 2 +-
> tests/qemu-iotests/111 | 3 +--
> tests/qemu-iotests/123 | 2 +-
> tests/qemu-iotests/153 | 2 +-
> tests/qemu-iotests/200 | 4 ++--
> 5 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
> index 9343e09492..d645952d54 100755
> --- a/tests/qemu-iotests/094
> +++ b/tests/qemu-iotests/094
> @@ -45,7 +45,7 @@ _supported_proto nbd
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> _make_test_img 64M
> -$QEMU_IMG create -f $IMGFMT "$TEST_DIR/source.$IMGFMT" 64M | _filter_img_create
> +TEST_IMG_FILE="$TEST_DIR/source.$IMGFMT" IMGPROTO=file _make_test_img 64M
>
> _launch_qemu -drive if=none,id=src,file="$TEST_DIR/source.$IMGFMT",format=raw \
> -nodefaults
> diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
> index 490a5bbcb5..3b43d1bd83 100755
> --- a/tests/qemu-iotests/111
> +++ b/tests/qemu-iotests/111
> @@ -41,8 +41,7 @@ _supported_fmt qed qcow qcow2 vmdk
> _supported_proto file
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> -$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
> - | _filter_testdir | _filter_imgfmt
> +_make_test_img -b "$TEST_IMG.inexistent"
>
> # success, all done
> echo '*** done'
> diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
> index d33950eb54..74d40d0478 100755
> --- a/tests/qemu-iotests/123
> +++ b/tests/qemu-iotests/123
> @@ -44,7 +44,7 @@ _supported_os Linux
> SRC_IMG="$TEST_DIR/source.$IMGFMT"
>
> _make_test_img 1M
> -$QEMU_IMG create -f $IMGFMT "$SRC_IMG" 1M | _filter_img_create
> +TEST_IMG_FILE=$SRC_IMG IMGPROTO=file _make_test_img 1M
>
> $QEMU_IO -c 'write -P 42 0 1M' "$SRC_IMG" | _filter_qemu_io
>
> diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
> index c969a1a16f..e59090259c 100755
> --- a/tests/qemu-iotests/153
> +++ b/tests/qemu-iotests/153
> @@ -98,7 +98,7 @@ for opts1 in "" "read-only=on" "read-only=on,force-share=on"; do
>
> echo
> echo "== Creating test image =="
> - $QEMU_IMG create -f $IMGFMT "${TEST_IMG}" -b ${TEST_IMG}.base | _filter_img_create
> + _make_test_img -b "${TEST_IMG}.base"
>
> echo
> echo "== Launching QEMU, opts: '$opts1' =="
> diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
> index 72d431f251..d904885136 100755
> --- a/tests/qemu-iotests/200
> +++ b/tests/qemu-iotests/200
> @@ -46,8 +46,8 @@ _supported_proto file
> BACKING_IMG="${TEST_DIR}/backing.img"
> TEST_IMG="${TEST_DIR}/test.img"
>
> -${QEMU_IMG} create -f $IMGFMT "${BACKING_IMG}" 512M | _filter_img_create
> -${QEMU_IMG} create -f $IMGFMT -F $IMGFMT "${TEST_IMG}" -b "${BACKING_IMG}" 512M | _filter_img_create
> +TEST_IMG="$BACKING_IMG" _make_test_img 512M
> +_make_test_img -F $IMGFMT -b "$BACKING_IMG" 512M
>
> ${QEMU_IO} -c "write -P 0xa5 512 300M" "${BACKING_IMG}" | _filter_qemu_io
>
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 11/18] iotests: Use _rm_test_img for deleting test images
2019-09-27 9:42 ` [PATCH 11/18] iotests: Use _rm_test_img for deleting test images Max Reitz
@ 2019-09-29 16:33 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:33 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Just rm will not delete external data files. Use _rm_test_img every
> time we delete a test image.
>
> (In the process, clean up the indentation of every _cleanup() this patch
> touches.)
>
> ((Also, use quotes consistently. I am happy to see unquoted instances
> like "rm -rf $TEST_DIR/..." go.))
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/005 | 2 +-
> tests/qemu-iotests/019 | 6 +++---
> tests/qemu-iotests/020 | 6 +++---
> tests/qemu-iotests/024 | 10 +++++-----
> tests/qemu-iotests/028 | 2 +-
> tests/qemu-iotests/029 | 2 +-
> tests/qemu-iotests/043 | 4 +++-
> tests/qemu-iotests/048 | 2 +-
> tests/qemu-iotests/050 | 4 ++--
> tests/qemu-iotests/053 | 4 ++--
> tests/qemu-iotests/058 | 2 +-
> tests/qemu-iotests/059 | 2 +-
> tests/qemu-iotests/061 | 2 +-
> tests/qemu-iotests/063 | 6 ++++--
> tests/qemu-iotests/069 | 2 +-
> tests/qemu-iotests/074 | 2 +-
> tests/qemu-iotests/080 | 2 +-
> tests/qemu-iotests/081 | 6 +++---
> tests/qemu-iotests/085 | 9 ++++++---
> tests/qemu-iotests/088 | 2 +-
> tests/qemu-iotests/092 | 2 +-
> tests/qemu-iotests/094 | 2 +-
> tests/qemu-iotests/095 | 5 +++--
> tests/qemu-iotests/099 | 7 ++++---
> tests/qemu-iotests/109 | 4 ++--
> tests/qemu-iotests/110 | 4 ++--
> tests/qemu-iotests/122 | 6 ++++--
> tests/qemu-iotests/123 | 2 +-
> tests/qemu-iotests/141 | 4 +++-
> tests/qemu-iotests/142 | 2 +-
> tests/qemu-iotests/144 | 4 +++-
> tests/qemu-iotests/153 | 10 +++-------
> tests/qemu-iotests/156 | 8 ++++++--
> tests/qemu-iotests/159 | 2 +-
> tests/qemu-iotests/160 | 3 ++-
> tests/qemu-iotests/161 | 4 ++--
> tests/qemu-iotests/170 | 2 +-
> tests/qemu-iotests/172 | 6 +++---
> tests/qemu-iotests/173 | 3 ++-
> tests/qemu-iotests/178 | 2 +-
> tests/qemu-iotests/182 | 2 +-
> tests/qemu-iotests/183 | 2 +-
> tests/qemu-iotests/185 | 4 ++--
> tests/qemu-iotests/187 | 6 +++---
> tests/qemu-iotests/190 | 2 +-
> tests/qemu-iotests/191 | 6 +++---
> tests/qemu-iotests/195 | 2 +-
> tests/qemu-iotests/197 | 2 +-
> tests/qemu-iotests/200 | 3 ++-
> tests/qemu-iotests/215 | 2 +-
> tests/qemu-iotests/225 | 2 +-
> tests/qemu-iotests/229 | 3 ++-
> tests/qemu-iotests/232 | 4 +++-
> tests/qemu-iotests/243 | 2 +-
> tests/qemu-iotests/244 | 4 ++--
> tests/qemu-iotests/247 | 4 +++-
> tests/qemu-iotests/249 | 4 ++--
> tests/qemu-iotests/252 | 2 +-
> 58 files changed, 119 insertions(+), 96 deletions(-)
>
> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
> index 58442762fe..2b651f2c37 100755
> --- a/tests/qemu-iotests/005
> +++ b/tests/qemu-iotests/005
> @@ -62,7 +62,7 @@ if [ "$IMGFMT" = "raw" ]; then
> if ! truncate --size=5T "$TEST_IMG"; then
> _notrun "file system on $TEST_DIR does not support large enough files"
> fi
> - rm "$TEST_IMG"
> + _rm_test_img "$TEST_IMG"
> fi
>
> echo
> diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
> index b4f5234609..813a84acac 100755
> --- a/tests/qemu-iotests/019
> +++ b/tests/qemu-iotests/019
> @@ -30,9 +30,9 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - _cleanup_test_img
> - rm -f "$TEST_IMG.base"
> - rm -f "$TEST_IMG.orig"
> + _cleanup_test_img
> + _rm_test_img "$TEST_IMG.base"
> + _rm_test_img "$TEST_IMG.orig"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
> index f41b92f35f..20f8f185d0 100755
> --- a/tests/qemu-iotests/020
> +++ b/tests/qemu-iotests/020
> @@ -28,9 +28,9 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - _cleanup_test_img
> - rm -f "$TEST_IMG.base"
> - rm -f "$TEST_IMG.orig"
> + _cleanup_test_img
> + _rm_test_img "$TEST_IMG.base"
> + _rm_test_img "$TEST_IMG.orig"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
> index 23298c6f59..e2e766241e 100755
> --- a/tests/qemu-iotests/024
> +++ b/tests/qemu-iotests/024
> @@ -29,12 +29,12 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_DIR/t.$IMGFMT.base_old"
> - rm -f "$TEST_DIR/t.$IMGFMT.base_new"
> + _rm_test_img "$TEST_DIR/t.$IMGFMT.base_old"
> + _rm_test_img "$TEST_DIR/t.$IMGFMT.base_new"
>
> - rm -f "$TEST_DIR/subdir/t.$IMGFMT"
> - rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_old"
> - rm -f "$TEST_DIR/subdir/t.$IMGFMT.base_new"
> + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT"
> + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_old"
> + _rm_test_img "$TEST_DIR/subdir/t.$IMGFMT.base_new"
> rmdir "$TEST_DIR/subdir" 2> /dev/null
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
> index 71301ec6e5..caf1258647 100755
> --- a/tests/qemu-iotests/028
> +++ b/tests/qemu-iotests/028
> @@ -32,7 +32,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_qemu
> - rm -f "${TEST_IMG}.copy"
> + _rm_test_img "${TEST_IMG}.copy"
> _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
> index 94c2713132..9254ede5e5 100755
> --- a/tests/qemu-iotests/029
> +++ b/tests/qemu-iotests/029
> @@ -28,7 +28,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -f $TEST_IMG.snap
> + _rm_test_img "$TEST_IMG.snap"
> _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
> index 67cc7e74c2..b102e49208 100755
> --- a/tests/qemu-iotests/043
> +++ b/tests/qemu-iotests/043
> @@ -29,7 +29,9 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG".[123].base
> + for img in "$TEST_IMG".[123].base; do
> + _rm_test_img "$img"
> + done
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/048 b/tests/qemu-iotests/048
> index bde408ca92..a8feb76184 100755
> --- a/tests/qemu-iotests/048
> +++ b/tests/qemu-iotests/048
> @@ -31,7 +31,7 @@ _cleanup()
> {
> echo "Cleanup"
> _cleanup_test_img
> - rm "${TEST_IMG_FILE2}"
> + _rm_test_img "${TEST_IMG_FILE2}"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
> index 272ecab195..cdc5356541 100755
> --- a/tests/qemu-iotests/050
> +++ b/tests/qemu-iotests/050
> @@ -29,8 +29,8 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.old"
> - rm -f "$TEST_IMG.new"
> + _rm_test_img "$TEST_IMG.old"
> + _rm_test_img "$TEST_IMG.new"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
> index e82bb69881..71d299c4f9 100755
> --- a/tests/qemu-iotests/053
> +++ b/tests/qemu-iotests/053
> @@ -28,8 +28,8 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -f "$TEST_IMG.orig"
> - _cleanup_test_img
> + _rm_test_img "$TEST_IMG.orig"
> + _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/058 b/tests/qemu-iotests/058
> index 8c3212a72f..ed01115fa3 100755
> --- a/tests/qemu-iotests/058
> +++ b/tests/qemu-iotests/058
> @@ -42,7 +42,7 @@ _cleanup()
> {
> nbd_server_stop
> _cleanup_test_img
> - rm -f "$converted_image"
> + _rm_test_img "$converted_image"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
> index 3941c3f0c2..5438025285 100755
> --- a/tests/qemu-iotests/059
> +++ b/tests/qemu-iotests/059
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.qcow2"
> + IMGFMT=qcow2 _rm_test_img "$TEST_IMG.qcow2"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
> index 0480be0141..b4076d8e8b 100755
> --- a/tests/qemu-iotests/061
> +++ b/tests/qemu-iotests/061
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f $TEST_IMG.data
> + _rm_test_img "$TEST_IMG.data"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
> index 7cf0427af4..eef2b8a534 100755
> --- a/tests/qemu-iotests/063
> +++ b/tests/qemu-iotests/063
> @@ -29,8 +29,10 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - _cleanup_test_img
> - rm -f "$TEST_IMG.orig" "$TEST_IMG.raw1" "$TEST_IMG.raw2"
> + _cleanup_test_img
> + for img in "$TEST_IMG".{orig,raw1,raw2,target}; do
> + _rm_test_img "$img"
> + done
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
> index 3974714852..b997b127f0 100755
> --- a/tests/qemu-iotests/069
> +++ b/tests/qemu-iotests/069
> @@ -47,7 +47,7 @@ echo "=== Creating an image with a backing file and deleting that file ==="
> echo
> TEST_IMG="$TEST_IMG.base" _make_test_img $IMG_SIZE
> _make_test_img -b "$TEST_IMG.base" $IMG_SIZE
> -rm -f "$TEST_IMG.base"
> +_rm_test_img "$TEST_IMG.base"
> # Just open the image and close it right again (this should print an error message)
> $QEMU_IO -c quit "$TEST_IMG" 2>&1 | _filter_testdir | _filter_imgfmt
>
> diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
> index bb4ad1cc08..62be89a0d9 100755
> --- a/tests/qemu-iotests/074
> +++ b/tests/qemu-iotests/074
> @@ -31,7 +31,7 @@ _cleanup()
> {
> echo "Cleanup"
> _cleanup_test_img
> - rm "${TEST_IMG2}"
> + _rm_test_img "${TEST_IMG2}"
> rm -f "$TEST_DIR/blkdebug.conf"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
> index 4bcb5021e8..b1ecafb41e 100755
> --- a/tests/qemu-iotests/080
> +++ b/tests/qemu-iotests/080
> @@ -28,7 +28,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -f $TEST_IMG.snap
> + _rm_test_img "$TEST_IMG.snap"
> _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
> index 85acdf76d4..537d40dfd5 100755
> --- a/tests/qemu-iotests/081
> +++ b/tests/qemu-iotests/081
> @@ -28,9 +28,9 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -rf $TEST_DIR/1.raw
> - rm -rf $TEST_DIR/2.raw
> - rm -rf $TEST_DIR/3.raw
> + _rm_test_img "$TEST_DIR/1.raw"
> + _rm_test_img "$TEST_DIR/2.raw"
> + _rm_test_img "$TEST_DIR/3.raw"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
> index d40fdab542..bbea1252d2 100755
> --- a/tests/qemu-iotests/085
> +++ b/tests/qemu-iotests/085
> @@ -41,10 +41,13 @@ _cleanup()
> _cleanup_qemu
> for i in $(seq 1 ${SNAPSHOTS})
> do
> - rm -f "${TEST_DIR}/${i}-${snapshot_virt0}"
> - rm -f "${TEST_DIR}/${i}-${snapshot_virt1}"
> + _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}"
> + _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt1}"
> + done
> + for img in "${TEST_IMG}".{1,2,base}
> + do
> + _rm_test_img "$img"
> done
> - rm -f "${TEST_IMG}" "${TEST_IMG}.1" "${TEST_IMG}.2" "${TEST_IMG}.base"
>
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
> index b44edd0cf9..ef1163346c 100755
> --- a/tests/qemu-iotests/088
> +++ b/tests/qemu-iotests/088
> @@ -28,7 +28,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -f $TEST_IMG.snap
> + _rm_test_img "$TEST_IMG.snap"
> _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092
> index e2e0726de1..40ec62b6f1 100755
> --- a/tests/qemu-iotests/092
> +++ b/tests/qemu-iotests/092
> @@ -28,7 +28,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -f $TEST_IMG.snap
> + _rm_test_img "$TEST_IMG.snap"
> _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
> index d645952d54..2d3e1004d3 100755
> --- a/tests/qemu-iotests/094
> +++ b/tests/qemu-iotests/094
> @@ -30,7 +30,7 @@ _cleanup()
> {
> _cleanup_qemu
> _cleanup_test_img
> - rm -f "$TEST_DIR/source.$IMGFMT"
> + _rm_test_img "$TEST_DIR/source.$IMGFMT"
> }
>
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
> index 58fe174b5e..155ae86aa7 100755
> --- a/tests/qemu-iotests/095
> +++ b/tests/qemu-iotests/095
> @@ -32,8 +32,9 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_qemu
> - rm -f "${TEST_IMG}.base" "${TEST_IMG}.snp1"
> - _cleanup_test_img
> + _rm_test_img "${TEST_IMG}.base"
> + _rm_test_img "${TEST_IMG}.snp1"
> + _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/099 b/tests/qemu-iotests/099
> index c3cf66798a..b383c11e6a 100755
> --- a/tests/qemu-iotests/099
> +++ b/tests/qemu-iotests/099
> @@ -29,7 +29,10 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - _cleanup_test_img
> + _cleanup_test_img
> + _rm_test_img "$TEST_IMG.compare"
> + rm -f "$TEST_DIR/blkdebug.conf"
> +
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> @@ -121,8 +124,6 @@ echo
> test_qemu "file.driver=blkdebug,file.image.filename=$TEST_IMG"
>
>
> -rm -f "$TEST_IMG.compare" "$TEST_DIR/blkdebug.conf"
> -
> # success, all done
> echo "*** done"
> rm -f $seq.full
> diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
> index 9897ceb6cd..ba638db11f 100755
> --- a/tests/qemu-iotests/109
> +++ b/tests/qemu-iotests/109
> @@ -29,8 +29,8 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_qemu
> - rm -f $TEST_IMG.src
> - _cleanup_test_img
> + _rm_test_img "$TEST_IMG.src"
> + _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
> index 2ef516baf1..f78df0e6e1 100755
> --- a/tests/qemu-iotests/110
> +++ b/tests/qemu-iotests/110
> @@ -28,8 +28,8 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - _cleanup_test_img
> - rm -f "$TEST_IMG.copy"
> + _cleanup_test_img
> + _rm_test_img "$TEST_IMG.copy"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/122 b/tests/qemu-iotests/122
> index 059011ebb1..dfa350936f 100755
> --- a/tests/qemu-iotests/122
> +++ b/tests/qemu-iotests/122
> @@ -28,8 +28,10 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -f "$TEST_IMG".[123]
> - _cleanup_test_img
> + for img in "$TEST_IMG".[123]; do
> + _rm_test_img "$img"
> + done
> + _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/123 b/tests/qemu-iotests/123
> index 74d40d0478..01b771c76e 100755
> --- a/tests/qemu-iotests/123
> +++ b/tests/qemu-iotests/123
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$SRC_IMG"
> + _rm_test_img "$SRC_IMG"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
> index 8c2ae79f2b..5192d256e3 100755
> --- a/tests/qemu-iotests/141
> +++ b/tests/qemu-iotests/141
> @@ -30,7 +30,9 @@ _cleanup()
> {
> _cleanup_qemu
> _cleanup_test_img
> - rm -f "$TEST_DIR"/{b,m,o}.$IMGFMT
> + for img in "$TEST_DIR"/{b,m,o}.$IMGFMT; do
> + _rm_test_img "$img"
> + done
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
> index 6b62271876..daefcbaa58 100755
> --- a/tests/qemu-iotests/142
> +++ b/tests/qemu-iotests/142
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f $TEST_IMG.snap
> + _rm_test_img "$TEST_IMG.snap"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
> index 011ed4f2bc..4569ac0b4b 100755
> --- a/tests/qemu-iotests/144
> +++ b/tests/qemu-iotests/144
> @@ -34,7 +34,9 @@ TMP_SNAP2=${TEST_DIR}/tmp2.qcow2
> _cleanup()
> {
> _cleanup_qemu
> - rm -f "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"
> + for img in "${TEST_IMG}" "${TMP_SNAP1}" "${TMP_SNAP2}"; do
> + _rm_test_img "$img"
> + done
> }
>
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
> index e59090259c..2b13111768 100755
> --- a/tests/qemu-iotests/153
> +++ b/tests/qemu-iotests/153
> @@ -30,13 +30,9 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "${TEST_IMG}.base"
> - rm -f "${TEST_IMG}.overlay"
> - rm -f "${TEST_IMG}.convert"
> - rm -f "${TEST_IMG}.a"
> - rm -f "${TEST_IMG}.b"
> - rm -f "${TEST_IMG}.c"
> - rm -f "${TEST_IMG}.lnk"
> + for img in "${TEST_IMG}".{base,overlay,convert,a,b,c,lnk}; do
> + _rm_test_img "$img"
> + done
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
> index 2ffa3ca942..3f27db71f2 100755
> --- a/tests/qemu-iotests/156
> +++ b/tests/qemu-iotests/156
> @@ -37,7 +37,9 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_qemu
> - rm -f "$TEST_IMG"{,.target}{,.backing,.overlay}
> + for img in "$TEST_IMG"{,.target}{,.backing,.overlay}; do
> + _rm_test_img "$img"
> + done
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> @@ -120,7 +122,9 @@ _send_qemu_cmd $QEMU_HANDLE \
> '"status": "null"'
>
> # Remove the source images
> -rm -f "$TEST_IMG{,.backing,.overlay}"
> +for img in "$TEST_IMG{,.backing,.overlay}"; do
> + _rm_test_img "$img"
> +done
>
> echo
>
> diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
> index 2557140ac2..f9690053a2 100755
> --- a/tests/qemu-iotests/159
> +++ b/tests/qemu-iotests/159
> @@ -28,7 +28,7 @@ status=1
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.out"
> + _rm_test_img "$TEST_IMG.out"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/160 b/tests/qemu-iotests/160
> index df89d3864b..0572b5ae9a 100755
> --- a/tests/qemu-iotests/160
> +++ b/tests/qemu-iotests/160
> @@ -28,7 +28,8 @@ status=1
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.out" "$TEST_IMG.out.dd"
> + _rm_test_img "$TEST_IMG.out"
> + _rm_test_img "$TEST_IMG.out.dd"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
> index 456a4bd8c4..f572a19af2 100755
> --- a/tests/qemu-iotests/161
> +++ b/tests/qemu-iotests/161
> @@ -30,8 +30,8 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.base"
> - rm -f "$TEST_IMG.int"
> + _rm_test_img "$TEST_IMG.base"
> + _rm_test_img "$TEST_IMG.int"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
> index 05dd6ed6c3..6c8f0e8085 100755
> --- a/tests/qemu-iotests/170
> +++ b/tests/qemu-iotests/170
> @@ -28,7 +28,7 @@ status=1
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.out"
> + _rm_test_img "$TEST_IMG.out"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/172 b/tests/qemu-iotests/172
> index d67997e5f6..7195fb895a 100755
> --- a/tests/qemu-iotests/172
> +++ b/tests/qemu-iotests/172
> @@ -28,9 +28,9 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - _cleanup_test_img
> - rm -f "$TEST_IMG.2"
> - rm -f "$TEST_IMG.3"
> + _cleanup_test_img
> + _rm_test_img "$TEST_IMG.2"
> + _rm_test_img "$TEST_IMG.3"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
> index 9e2fa2e73c..bba26f0d2a 100755
> --- a/tests/qemu-iotests/173
> +++ b/tests/qemu-iotests/173
> @@ -29,7 +29,8 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_qemu
> - rm -f "${QEMU_TEST_DIR}/image.base" "${QEMU_TEST_DIR}/image.snp1"
> + _rm_test_img "${TEST_DIR}/image.base"
> + _rm_test_img "${TEST_DIR}/image.snp1"
> _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/178 b/tests/qemu-iotests/178
> index 75b5e8f314..51a70fe669 100755
> --- a/tests/qemu-iotests/178
> +++ b/tests/qemu-iotests/178
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.converted"
> + _rm_test_img "$TEST_IMG.converted"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
> index 7f494eb9bb..8de724e7ec 100755
> --- a/tests/qemu-iotests/182
> +++ b/tests/qemu-iotests/182
> @@ -30,7 +30,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.overlay"
> + _rm_test_img "$TEST_IMG.overlay"
> rm -f "$TEST_DIR/nbd.socket"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
> index 04fb344d08..eff8e0216c 100755
> --- a/tests/qemu-iotests/183
> +++ b/tests/qemu-iotests/183
> @@ -31,7 +31,7 @@ MIG_SOCKET="${TEST_DIR}/migrate"
> _cleanup()
> {
> rm -f "${MIG_SOCKET}"
> - rm -f "${TEST_IMG}.dest"
> + _rm_test_img "${TEST_IMG}.dest"
> _cleanup_test_img
> _cleanup_qemu
> }
> diff --git a/tests/qemu-iotests/185 b/tests/qemu-iotests/185
> index 454ff600cc..e50f19ebf0 100755
> --- a/tests/qemu-iotests/185
> +++ b/tests/qemu-iotests/185
> @@ -28,8 +28,8 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -f "${TEST_IMG}.mid"
> - rm -f "${TEST_IMG}.copy"
> + _rm_test_img "${TEST_IMG}.mid"
> + _rm_test_img "${TEST_IMG}.copy"
> _cleanup_test_img
> _cleanup_qemu
> }
> diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
> index 2fcef9e2bd..c6e1dc57a0 100755
> --- a/tests/qemu-iotests/187
> +++ b/tests/qemu-iotests/187
> @@ -28,9 +28,9 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - _cleanup_test_img
> - rm -f "$TEST_IMG.2"
> - rm -f "$TEST_IMG.3"
> + _cleanup_test_img
> + _rm_test_img "$TEST_IMG.2"
> + _rm_test_img "$TEST_IMG.3"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
> index 5890ff9cfc..6d41650438 100755
> --- a/tests/qemu-iotests/190
> +++ b/tests/qemu-iotests/190
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.converted"
> + _rm_test_img "$TEST_IMG.converted"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
> index 21c16a32cb..23ab0ce899 100755
> --- a/tests/qemu-iotests/191
> +++ b/tests/qemu-iotests/191
> @@ -28,9 +28,9 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> - rm -f "${TEST_IMG}.mid"
> - rm -f "${TEST_IMG}.ovl2"
> - rm -f "${TEST_IMG}.ovl3"
> + _rm_test_img "${TEST_IMG}.mid"
> + _rm_test_img "${TEST_IMG}.ovl2"
> + _rm_test_img "${TEST_IMG}.ovl3"
> _cleanup_test_img
> _cleanup_qemu
> }
> diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
> index ef7b9a94e2..48984b7ac1 100755
> --- a/tests/qemu-iotests/195
> +++ b/tests/qemu-iotests/195
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.mid"
> + _rm_test_img "$TEST_IMG.mid"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
> index 4d3d08ad6f..95f05b0e34 100755
> --- a/tests/qemu-iotests/197
> +++ b/tests/qemu-iotests/197
> @@ -43,7 +43,7 @@ esac
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_WRAP"
> + _rm_test_img "$TEST_WRAP"
> rm -f "$BLKDBG_CONF"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
> index d904885136..a2cdd7f83d 100755
> --- a/tests/qemu-iotests/200
> +++ b/tests/qemu-iotests/200
> @@ -31,7 +31,8 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_qemu
> - rm -f "${TEST_IMG}" "${BACKING_IMG}"
> + _rm_test_img "${TEST_IMG}"
> + _rm_test_img "${BACKING_IMG}"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
> index 55a1874dcd..f99bae78c7 100755
> --- a/tests/qemu-iotests/215
> +++ b/tests/qemu-iotests/215
> @@ -40,7 +40,7 @@ esac
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_WRAP"
> + _rm_test_img "$TEST_WRAP"
> rm -f "$BLKDBG_CONF"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/225 b/tests/qemu-iotests/225
> index fbd7404791..c9a334c7e9 100755
> --- a/tests/qemu-iotests/225
> +++ b/tests/qemu-iotests/225
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.not_base"
> + _rm_test_img "$TEST_IMG.not_base"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
> index e18a464fe0..866168b236 100755
> --- a/tests/qemu-iotests/229
> +++ b/tests/qemu-iotests/229
> @@ -31,7 +31,8 @@ _cleanup()
> {
> _cleanup_qemu
> _cleanup_test_img
> - rm -f "$TEST_IMG" "$DEST_IMG"
> + _rm_test_img "$TEST_IMG"
> + _rm_test_img "$DEST_IMG"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/232 b/tests/qemu-iotests/232
> index 65b0e42063..685356ac3b 100755
> --- a/tests/qemu-iotests/232
> +++ b/tests/qemu-iotests/232
> @@ -29,7 +29,9 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f $TEST_IMG.[01234]
> + for img in "$TEST_IMG".[01234]; do
> + _rm_test_img "$img"
> + done
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
> index 2b84b896db..3dc3b6a711 100755
> --- a/tests/qemu-iotests/243
> +++ b/tests/qemu-iotests/243
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f $TEST_IMG.data
> + _rm_test_img "$TEST_IMG.data"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
> index 0375bc12d4..13263292b0 100755
> --- a/tests/qemu-iotests/244
> +++ b/tests/qemu-iotests/244
> @@ -29,8 +29,8 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f $TEST_IMG.data
> - rm -f $TEST_IMG.src
> + _rm_test_img "$TEST_IMG.data"
> + _rm_test_img "$TEST_IMG.src"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
> index c853b73819..87e37b39e2 100755
> --- a/tests/qemu-iotests/247
> +++ b/tests/qemu-iotests/247
> @@ -29,7 +29,9 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f $TEST_IMG.[01234]
> + for img in "$TEST_IMG".[01234]; do
> + _rm_test_img "$img"
> + done
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
> index e4650ecf6b..2b99c9789e 100755
> --- a/tests/qemu-iotests/249
> +++ b/tests/qemu-iotests/249
> @@ -30,8 +30,8 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.base"
> - rm -f "$TEST_IMG.int"
> + _rm_test_img "$TEST_IMG.base"
> + _rm_test_img "$TEST_IMG.int"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252
> index f6c8f71444..83280c1715 100755
> --- a/tests/qemu-iotests/252
> +++ b/tests/qemu-iotests/252
> @@ -29,7 +29,7 @@ status=1 # failure is the default!
> _cleanup()
> {
> _cleanup_test_img
> - rm -f "$TEST_IMG.base_new"
> + _rm_test_img "$TEST_IMG.base_new"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
The patch is large, thus I can't be sure I can check all of it,
but overall looks good to me.
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 12/18] iotests: Avoid cp/mv of test images
2019-09-27 9:42 ` [PATCH 12/18] iotests: Avoid cp/mv of " Max Reitz
@ 2019-09-29 16:33 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:33 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> This will not work with external data files, so try to get tests working
> without it as far as possible.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/063 | 12 ++++--------
> tests/qemu-iotests/063.out | 3 ++-
> tests/qemu-iotests/085 | 9 +++------
> tests/qemu-iotests/085.out | 8 ++++----
> 4 files changed, 13 insertions(+), 19 deletions(-)
>
> diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
> index eef2b8a534..c750b3806e 100755
> --- a/tests/qemu-iotests/063
> +++ b/tests/qemu-iotests/063
> @@ -51,15 +51,13 @@ _unsupported_imgopts "subformat=monolithicFlat" \
> _make_test_img 4M
>
> echo "== Testing conversion with -n fails with no target file =="
> -# check .orig file does not exist
> -rm -f "$TEST_IMG.orig"
> if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" >/dev/null 2>&1; then
> exit 1
> fi
>
> echo "== Testing conversion with -n succeeds with a target file =="
> -rm -f "$TEST_IMG.orig"
> -cp "$TEST_IMG" "$TEST_IMG.orig"
> +_rm_test_img "$TEST_IMG.orig"
> +TEST_IMG="$TEST_IMG.orig" _make_test_img 4M
> if ! $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.orig" ; then
> exit 1
> fi
> @@ -85,10 +83,8 @@ fi
> _check_test_img
>
> echo "== Testing conversion to a smaller file fails =="
> -rm -f "$TEST_IMG.orig"
> -mv "$TEST_IMG" "$TEST_IMG.orig"
> -_make_test_img 2M
> -if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG.orig" "$TEST_IMG" >/dev/null 2>&1; then
> +TEST_IMG="$TEST_IMG.target" _make_test_img 2M
> +if $QEMU_IMG convert -f $IMGFMT -O $IMGFMT -n "$TEST_IMG" "$TEST_IMG.target" >/dev/null 2>&1; then
> exit 1
> fi
>
> diff --git a/tests/qemu-iotests/063.out b/tests/qemu-iotests/063.out
> index 7b691b2c9e..890b719bf0 100644
> --- a/tests/qemu-iotests/063.out
> +++ b/tests/qemu-iotests/063.out
> @@ -2,11 +2,12 @@ QA output created by 063
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=4194304
> == Testing conversion with -n fails with no target file ==
> == Testing conversion with -n succeeds with a target file ==
> +Formatting 'TEST_DIR/t.IMGFMT.orig', fmt=IMGFMT size=4194304
> == Testing conversion to raw is the same after conversion with -n ==
> == Testing conversion back to original format ==
> No errors were found on the image.
> == Testing conversion to a smaller file fails ==
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=2097152
> +Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=2097152
> == Regression testing for copy offloading bug ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
> Formatting 'TEST_DIR/t.IMGFMT.target', fmt=IMGFMT size=1048576
> diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
> index bbea1252d2..46981dbb64 100755
> --- a/tests/qemu-iotests/085
> +++ b/tests/qemu-iotests/085
> @@ -105,8 +105,7 @@ add_snapshot_image()
> {
> base_image="${TEST_DIR}/$((${1}-1))-${snapshot_virt0}"
> snapshot_file="${TEST_DIR}/${1}-${snapshot_virt0}"
> - _make_test_img -u -b "${base_image}" "$size"
> - mv "${TEST_IMG}" "${snapshot_file}"
> + TEST_IMG=$snapshot_file _make_test_img -u -b "${base_image}" "$size"
> do_blockdev_add "$1" "'backing': null, " "${snapshot_file}"
> }
>
> @@ -122,10 +121,8 @@ blockdev_snapshot()
>
> size=128M
>
> -_make_test_img $size
> -mv "${TEST_IMG}" "${TEST_IMG}.1"
> -_make_test_img $size
> -mv "${TEST_IMG}" "${TEST_IMG}.2"
> +TEST_IMG="$TEST_IMG.1" _make_test_img $size
> +TEST_IMG="$TEST_IMG.2" _make_test_img $size
>
> echo
> echo === Running QEMU ===
> diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out
> index 2a5f256cd3..313198f182 100644
> --- a/tests/qemu-iotests/085.out
> +++ b/tests/qemu-iotests/085.out
> @@ -1,6 +1,6 @@
> QA output created by 085
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> +Formatting 'TEST_DIR/t.IMGFMT.1', fmt=IMGFMT size=134217728
> +Formatting 'TEST_DIR/t.IMGFMT.2', fmt=IMGFMT size=134217728
>
> === Running QEMU ===
>
> @@ -55,10 +55,10 @@ Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=qcow2 size=134217728 backing_fil
>
> === Create a couple of snapshots using blockdev-snapshot ===
>
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
> +Formatting 'TEST_DIR/11-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/10-snapshot-v0.IMGFMT
> {"return": {}}
> {"return": {}}
> -Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
> +Formatting 'TEST_DIR/12-snapshot-v0.IMGFMT', fmt=IMGFMT size=134217728 backing_file=TEST_DIR/11-snapshot-v0.IMGFMT
> {"return": {}}
> {"return": {}}
>
Looks good.
Reviewed-by: Maxim Levitsky <mlevitsk@redhat.com>
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 13/18] iotests: Make 091 work with data_file
2019-09-27 9:42 ` [PATCH 13/18] iotests: Make 091 work with data_file Max Reitz
@ 2019-09-29 16:34 ` Maxim Levitsky
2019-09-30 13:07 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:34 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> The image end offset as reported by qemu-img check is different when
> using an external data file; we do not care about its value here, so we
> can just filter it.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/091 | 3 ++-
> tests/qemu-iotests/091.out | 1 -
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
> index f4b44659ae..7536ca4607 100755
> --- a/tests/qemu-iotests/091
> +++ b/tests/qemu-iotests/091
> @@ -101,7 +101,8 @@ echo "Check image pattern"
> ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io
>
> echo "Running 'qemu-img check -r all \$TEST_IMG'"
> -"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu
> +"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu \
> + | sed '/Image end offset/d'
Maybe use _filter_qemu_img_check instead? I see it actually filters this already.
>
> echo "*** done"
> rm -f $seq.full
> diff --git a/tests/qemu-iotests/091.out b/tests/qemu-iotests/091.out
> index 5017f8c2d9..343fac69e0 100644
> --- a/tests/qemu-iotests/091.out
> +++ b/tests/qemu-iotests/091.out
> @@ -24,5 +24,4 @@ read 4194304/4194304 bytes at offset 0
> Running 'qemu-img check -r all $TEST_IMG'
> No errors were found on the image.
> 80/16384 = 0.49% allocated, 0.00% fragmented, 0.00% compressed clusters
> -Image end offset: 5570560
> *** done
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 14/18] iotests: Make 110 work with data_file
2019-09-27 9:42 ` [PATCH 14/18] iotests: Make 110 " Max Reitz
@ 2019-09-29 16:34 ` Maxim Levitsky
2019-09-30 13:34 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:34 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> The only difference is that the json:{} filename of the image looks
> different. We actually do not care about that filename in this test, we
> are only interested in (1) that there is a json:{} filename, and (2)
> whether the backing filename can be constructed.
>
> So just filter out the json:{} data, thus making this test pass both
> with and without data_file.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/110 | 7 +++++--
> tests/qemu-iotests/110.out | 4 ++--
> 2 files changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
> index f78df0e6e1..34459dcd60 100755
> --- a/tests/qemu-iotests/110
> +++ b/tests/qemu-iotests/110
> @@ -67,6 +67,7 @@ echo
> # Across blkdebug without a config file, you cannot reconstruct filenames, so
> # qemu is incapable of knowing the directory of the top image from the filename
> # alone. However, using bdrv_dirname(), it should still work.
> +# (Filter out the json:{} filename so this test works with external data files)
> TEST_IMG="json:{
> 'driver': '$IMGFMT',
> 'file': {
> @@ -82,7 +83,8 @@ TEST_IMG="json:{
> }
> ]
> }
> -}" _img_info | _filter_img_info | grep -v 'backing file format'
> +}" _img_info | _filter_img_info | grep -v 'backing file format' \
> + | sed -e 's#^image: json:.*#image: json:{ /* filtered */ }#'
>
> echo
> echo '=== Backing name is always relative to the backed image ==='
> @@ -114,7 +116,8 @@ TEST_IMG="json:{
> }
> ]
> }
> -}" _img_info | _filter_img_info | grep -v 'backing file format'
> +}" _img_info | _filter_img_info | grep -v 'backing file format' \
> + | sed -e 's#^image: json:.*#image: json:{ /* filtered */ }#'
>
>
> # success, all done
> diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
> index f60b26390e..f835553a99 100644
> --- a/tests/qemu-iotests/110.out
> +++ b/tests/qemu-iotests/110.out
> @@ -11,7 +11,7 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
>
> === Non-reconstructable filename ===
>
> -image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
> +image: json:{ /* filtered */ }
> file format: IMGFMT
> virtual size: 64 MiB (67108864 bytes)
> backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
> @@ -22,7 +22,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
>
> === Nodes without a common directory ===
>
> -image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-
> threshold": 1}}
> +image: json:{ /* filtered */ }
> file format: IMGFMT
> virtual size: 64 MiB (67108864 bytes)
> backing file: t.IMGFMT.base (cannot determine actual path)
Again, maybe put that into the common.filter, so new tests won't need to copy&paste this?
Also maybe remove the image name completely from output, thus not needing the more complex regex?
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 15/18] iotests: Make 137 work with data_file
2019-09-27 9:42 ` [PATCH 15/18] iotests: Make 137 " Max Reitz
@ 2019-09-29 16:38 ` Maxim Levitsky
2019-09-30 13:38 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:38 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> When using an external data file, there are no refcounts for data
> clusters. We thus have to adjust the corruption test in this patch to
> not be based around a data cluster allocation, but the L2 table
> allocation (L2 tables are still refcounted with external data files).
>
> Doing so means this test works both with and without external data
> files.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/137 | 10 ++++++----
> tests/qemu-iotests/137.out | 4 +---
> 2 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
> index 6cf2997577..dd3484205e 100755
> --- a/tests/qemu-iotests/137
> +++ b/tests/qemu-iotests/137
> @@ -138,14 +138,16 @@ $QEMU_IO \
> "$TEST_IMG" 2>&1 | _filter_qemu_io
>
> # The dirty bit must not be set
> -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
> +# (Filter the external data file bit)
> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
> + | sed -e 's/0x4/0x0/'
Maybe it is better to filter all the feature bits, but the dirty bit,
since only it is needed here, so that when we start running tests with
more features, we won't need to do this again?
>
> # Similarly we can test whether corruption detection has been enabled:
> -# Create L1/L2, overwrite first entry in refcount block, allocate something.
> +# Create L1, overwrite refcounts, force allocation of L2 by writing
> +# data.
> # Disabling the checks should fail, so the corruption must be detected.
> _make_test_img 64M
> -$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io
> -poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00"
> +poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00"
I am wondering if there is any better way to do this (regardless of this patch),
Basically the above code pokes into the 3rd cluster on the disk I *think*, and I don't
understand why it has to contain refcounts. Hmm...
First cluster I can guess will have the header, 2nd cluster probably L1 table, and 3rd, refcounts?
If so, the test should specify that it needs 64K clusters, because the day will come when
we will need to test this as well, but I guess in a separate patch,
> $QEMU_IO \
> -c "reopen -o overlap-check=none,lazy-refcounts=42" \
> -c "write 64k 64k" \
> diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
> index 1c6569eb2c..bd5f76d604 100644
> --- a/tests/qemu-iotests/137.out
> +++ b/tests/qemu-iotests/137.out
> @@ -38,9 +38,7 @@ wrote 512/512 bytes at offset 0
> ./common.rc: Killed ( VALGRIND_QEMU="${VALGRIND_QEMU_IO}" _qemu_proc_exec "${VALGRIND_LOGFILE}" "$QEMU_IO_PROG" $QEMU_IO_ARGS "$@" )
> incompatible_features 0x0
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -wrote 65536/65536 bytes at offset 0
> -64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
> -qcow2: Marking image as corrupt: Preventing invalid write on metadata (overlaps with qcow2_header); further corruption events will be suppressed
> +qcow2: Marking image as corrupt: Preventing invalid allocation of L2 table at offset 0; further corruption events will be suppressed
> write failed: Input/output error
> *** done
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 16/18] iotests: Make 198 work with data_file
2019-09-27 9:42 ` [PATCH 16/18] iotests: Make 198 " Max Reitz
@ 2019-09-29 16:38 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:38 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> We do not care about the json:{} filenames here, so we can just filter
> them out and thus make the test work both with and without external data
> files.
Same comment as for iotest 110, this is more justification to move this
outside to reduce duplication.
Best regards,
Maxim Levitsky
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/198 | 6 ++++--
> tests/qemu-iotests/198.out | 4 ++--
> 2 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/tests/qemu-iotests/198 b/tests/qemu-iotests/198
> index c8f824cfae..d9981942a7 100755
> --- a/tests/qemu-iotests/198
> +++ b/tests/qemu-iotests/198
> @@ -92,13 +92,15 @@ echo
> echo "== checking image base =="
> $QEMU_IMG info --image-opts $IMGSPECBASE | _filter_img_info --format-specific \
> | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
> - -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
> + -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
> + -e 's#image: json:.*#image: json:{ /* filtered */ }#'
>
> echo
> echo "== checking image layer =="
> $QEMU_IMG info --image-opts $IMGSPECLAYER | _filter_img_info --format-specific \
> | sed -e "/^disk size:/ D" -e '/refcount bits:/ D' -e '/compat:/ D' \
> - -e '/lazy refcounts:/ D' -e '/corrupt:/ D'
> + -e '/lazy refcounts:/ D' -e '/corrupt:/ D' -e '/^\s*data file/ D' \
> + -e 's#image: json:.*#image: json:{ /* filtered */ }#'
>
>
> # success, all done
> diff --git a/tests/qemu-iotests/198.out b/tests/qemu-iotests/198.out
> index e86b175e39..831ce3a289 100644
> --- a/tests/qemu-iotests/198.out
> +++ b/tests/qemu-iotests/198.out
> @@ -32,7 +32,7 @@ read 16777216/16777216 bytes at offset 0
> 16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == checking image base ==
> -image: json:{"encrypt.key-secret": "sec0", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.base"}}
> +image: json:{ /* filtered */ }
> file format: IMGFMT
> virtual size: 16 MiB (16777216 bytes)
> Format specific information:
> @@ -74,7 +74,7 @@ Format specific information:
> master key iters: 1024
>
> == checking image layer ==
> -image: json:{"encrypt.key-secret": "sec1", "driver": "IMGFMT", "file": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}}
> +image: json:{ /* filtered */ }
> file format: IMGFMT
> virtual size: 16 MiB (16777216 bytes)
> backing file: TEST_DIR/t.IMGFMT.base
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 17/18] iotests: Disable data_file where it cannot be used
2019-09-27 9:42 ` [PATCH 17/18] iotests: Disable data_file where it cannot be used Max Reitz
@ 2019-09-29 16:39 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:39 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/007 | 5 +++--
> tests/qemu-iotests/014 | 2 ++
> tests/qemu-iotests/015 | 5 +++--
> tests/qemu-iotests/026 | 5 ++++-
> tests/qemu-iotests/029 | 5 +++--
> tests/qemu-iotests/031 | 6 +++---
> tests/qemu-iotests/036 | 5 +++--
> tests/qemu-iotests/039 | 3 +++
> tests/qemu-iotests/046 | 2 ++
> tests/qemu-iotests/048 | 2 ++
> tests/qemu-iotests/051 | 5 +++--
> tests/qemu-iotests/058 | 5 +++--
> tests/qemu-iotests/060 | 6 ++++--
> tests/qemu-iotests/061 | 6 ++++--
> tests/qemu-iotests/062 | 2 +-
> tests/qemu-iotests/066 | 2 +-
> tests/qemu-iotests/067 | 6 ++++--
> tests/qemu-iotests/068 | 5 +++--
> tests/qemu-iotests/071 | 3 +++
> tests/qemu-iotests/073 | 2 ++
> tests/qemu-iotests/074 | 2 ++
> tests/qemu-iotests/080 | 5 +++--
> tests/qemu-iotests/090 | 2 ++
> tests/qemu-iotests/098 | 4 +++-
> tests/qemu-iotests/099 | 3 ++-
> tests/qemu-iotests/103 | 5 +++--
> tests/qemu-iotests/108 | 6 ++++--
> tests/qemu-iotests/112 | 5 +++--
> tests/qemu-iotests/114 | 2 ++
> tests/qemu-iotests/121 | 3 +++
> tests/qemu-iotests/138 | 2 ++
> tests/qemu-iotests/156 | 2 ++
> tests/qemu-iotests/176 | 7 +++++--
> tests/qemu-iotests/191 | 2 ++
> tests/qemu-iotests/201 | 6 +++---
> tests/qemu-iotests/214 | 3 ++-
> tests/qemu-iotests/217 | 3 ++-
> tests/qemu-iotests/220 | 5 +++--
> tests/qemu-iotests/243 | 6 ++++--
> tests/qemu-iotests/244 | 5 +++--
> tests/qemu-iotests/250 | 2 ++
> tests/qemu-iotests/267 | 5 +++--
> 42 files changed, 116 insertions(+), 51 deletions(-)
>
No iotest 267 on master branch, same as patch 9
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 18/18] iotests: Allow check -o data_file
2019-09-27 9:42 ` [PATCH 18/18] iotests: Allow check -o data_file Max Reitz
@ 2019-09-29 16:39 ` Maxim Levitsky
2019-09-30 13:43 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-29 16:39 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> The problem with allowing the data_file option is that you want to use a
> different data file per image used in the test. Therefore, we need to
> allow patterns like -o data_file='$TEST_IMG.data_file'.
>
> Then, we need to filter it out from qemu-img map, qemu-img create, and
> remove the data file in _rm_test_img.
>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
> tests/qemu-iotests/common.filter | 21 +++++++++++++++++++--
> tests/qemu-iotests/common.rc | 10 +++++++++-
> 2 files changed, 28 insertions(+), 3 deletions(-)
>
> diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
> index 841f7642af..a11f9a8972 100644
> --- a/tests/qemu-iotests/common.filter
> +++ b/tests/qemu-iotests/common.filter
> @@ -115,7 +115,15 @@ _filter_actual_image_size()
> # replace driver-specific options in the "Formatting..." line
> _filter_img_create()
> {
> - $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
> + data_file_filter=()
> + if echo "$IMGOPTS" | grep -q 'data_file='; then
> + data_file=$(echo "$IMGOPTS" | sed -e 's/.*\(data_file=[^,]*\).*/\1/' \
> + -e "s#\\\$TEST_IMG#$TEST_IMG#")
Could you maybe add a comment on this regular expression, similar
to what is in the commit message?
> + data_file_filter=(-e "s# $data_file##")
Why to use array here? A variable would work too I think.
> + fi
> +
> + $SED "${data_file_filter[@]}" \
> + -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
> -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
> -e "s#$TEST_DIR#TEST_DIR#g" \
> -e "s#$IMGFMT#IMGFMT#g" \
> @@ -198,9 +206,18 @@ _filter_img_info()
> # human and json output
> _filter_qemu_img_map()
> {
> + data_file_filter=()
> + if echo "$IMGOPTS" | grep -q 'data_file='; then
> + data_file_pattern=$(echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \
> + -e 's#\$TEST_IMG#\\(.*\\)#')
> + data_file_filter=(-e "s#$data_file_pattern#\\1#")
Seems to do the same thing, but in slightly different way.
Maybe make a function to avoid duplication?
I am not 100% sure though.
> + fi
> +
> $SED -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \
> -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \
> - -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt
> + -e 's/Mapped to *//' \
> + "${data_file_filter[@]}" \
> + | _filter_testdir | _filter_imgfmt
> }
>
> _filter_nbd()
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index f3784077de..834ece12e4 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -297,7 +297,8 @@ _make_test_img()
> fi
>
> if [ -n "$IMGOPTS" ]; then
> - optstr=$(_optstr_add "$optstr" "$IMGOPTS")
> + imgopts_expanded=$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$img_name#")
> + optstr=$(_optstr_add "$optstr" "$imgopts_expanded")
Also a comment explaining why this is needed would be welcome.
> fi
> if [ -n "$IMGKEYSECRET" ]; then
> object_options="--object secret,id=keysec0,data=$IMGKEYSECRET"
> @@ -376,6 +377,13 @@ _rm_test_img()
> # Remove all the extents for vmdk
> "$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f 2 -d: \
> | xargs -I {} rm -f "{}"
> + elif [ "$IMGFMT" = "qcow2" ]; then
> + # Remove external data file
> + if echo "$IMGOPTS" | grep -q 'data_file='; then
> + data_file=$(echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \
> + -e "s#\\\$TEST_IMG#$img#")
Same here, even more evidence that it would be nice to move this to a common function.
Again, I am not 100% sure that this is the same regex, but it looks like that.
> + rm -f "$data_file"
> + fi
> fi
> rm -f "$img"
> }
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 01/18] iotests: Filter refcount_order in 036
2019-09-29 16:31 ` Maxim Levitsky
@ 2019-09-30 12:43 ` Max Reitz
2019-09-30 13:40 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 12:43 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 3484 bytes --]
On 29.09.19 18:31, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> This test can run just fine with other values for refcount_bits, so we
>> should filter the value from qcow2.py's dump-header.
>>
>> (036 currently ignores user-specified image options, but that will be
>> fixed in the next patch.)
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> tests/qemu-iotests/036 | 9 ++++++---
>> tests/qemu-iotests/036.out | 6 +++---
>> 2 files changed, 9 insertions(+), 6 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
>> index f06ff67408..69d0f9f903 100755
>> --- a/tests/qemu-iotests/036
>> +++ b/tests/qemu-iotests/036
>> @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
>>
>> # Without feature table
>> $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>> _img_info
>>
>> # With feature table containing bit 63
>> @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
>> echo
>> _make_test_img 64M
>> $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>>
>> echo
>> echo === Repair image ===
>> echo
>> _check_test_img -r all
>>
>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>>
>> # success, all done
>> echo "*** done"
>> diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
>> index e489b44386..998c2a8a35 100644
>> --- a/tests/qemu-iotests/036.out
>> +++ b/tests/qemu-iotests/036.out
>> @@ -19,7 +19,7 @@ snapshot_offset 0x0
>> incompatible_features 0x8000000000000000
>> compatible_features 0x0
>> autoclear_features 0x0
>> -refcount_order 4
>> +refcount_order (filtered)
>> header_length 104
>>
>> qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
>> @@ -53,7 +53,7 @@ snapshot_offset 0x0
>> incompatible_features 0x0
>> compatible_features 0x0
>> autoclear_features 0x8000000000000000
>> -refcount_order 4
>> +refcount_order (filtered)
>> header_length 104
>>
>> Header extension:
>> @@ -81,7 +81,7 @@ snapshot_offset 0x0
>> incompatible_features 0x0
>> compatible_features 0x0
>> autoclear_features 0x0
>> -refcount_order 4
>> +refcount_order (filtered)
>> header_length 104
>>
>> Header extension:
>
> Minor notes:
>
> 1. Maybe put the sed command into a function to avoid duplication?
Hm, maybe, but that would increase the LoC, so I’m not sure whether it
really would be a simplification.
> 2. As I understand the test, it only checks the feature bits.
> So maybe instead of blacklisting some of the values, white list
> only the feature bits in the output?
Hm. Seems reasonable, but then again I’d prefer a minimal change, and
changing it to a whitelist would be more change...
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts
2019-09-29 16:31 ` Maxim Levitsky
@ 2019-09-30 12:59 ` Max Reitz
2019-09-30 14:47 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 12:59 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 5091 bytes --]
On 29.09.19 18:31, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
>> globally. That is not how it should be done; instead, they should
>> simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
>> default anyway).
>>
>> This makes the tests heed user-specified $IMGOPTS. Some do not work
>> with all image options, though, so we need to disable them accordingly.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> tests/qemu-iotests/036 | 3 +--
>> tests/qemu-iotests/060 | 4 ++--
>> tests/qemu-iotests/062 | 3 ++-
>> tests/qemu-iotests/066 | 3 ++-
>> tests/qemu-iotests/068 | 3 ++-
>> tests/qemu-iotests/098 | 3 +--
>> 6 files changed, 10 insertions(+), 9 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
>> index 69d0f9f903..57dda23b02 100755
>> --- a/tests/qemu-iotests/036
>> +++ b/tests/qemu-iotests/036
>> @@ -43,9 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>> # This tests qcow2-specific low-level functionality
>> _supported_fmt qcow2
>> _supported_proto file
>> -
>> # Only qcow2v3 and later supports feature bits
>> -IMGOPTS="compat=1.1"
>> +_unsupported_imgopts 'compat=0.10'
>>
>> echo
>> echo === Image with unknown incompatible feature bit ===
>> diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
>> index b91d8321bb..9c2ef42522 100755
>> --- a/tests/qemu-iotests/060
>> +++ b/tests/qemu-iotests/060
>> @@ -48,6 +48,8 @@ _filter_io_error()
>> _supported_fmt qcow2
>> _supported_proto file
>> _supported_os Linux
>> +# These tests only work for compat=1.1 images with refcount_bits=16
>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
>>
>> rt_offset=65536 # 0x10000 (XXX: just an assumption)
>> rb_offset=131072 # 0x20000 (XXX: just an assumption)
>> @@ -55,8 +57,6 @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
>> l2_offset=262144 # 0x40000 (XXX: just an assumption)
>> l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
>>
>> -IMGOPTS="compat=1.1"
>> -
>> OPEN_RW="open -o overlap-check=all $TEST_IMG"
>> # Overlap checks are done before write operations only, therefore opening an
>> # image read-only makes the overlap-check option irrelevant
>> diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
>> index d5f818fcce..ac0d2a9a3b 100755
>> --- a/tests/qemu-iotests/062
>> +++ b/tests/qemu-iotests/062
>> @@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>> # This tests qocw2-specific low-level functionality
>> _supported_fmt qcow2
>> _supported_proto generic
>> +# We need zero clusters and snapshots
>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>>
>> -IMGOPTS="compat=1.1"
>> IMG_SIZE=64M
>>
>> echo
>> diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
>> index 28f8c98412..9a15ba8027 100755
>> --- a/tests/qemu-iotests/066
>> +++ b/tests/qemu-iotests/066
>> @@ -39,9 +39,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>> # This tests qocw2-specific low-level functionality
>> _supported_fmt qcow2
>> _supported_proto generic
>> +# Weneed zero clusters and snapshots
> Typo
Indeed!
>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>>
>> # Intentionally create an unaligned image
>> -IMGOPTS="compat=1.1"
>> IMG_SIZE=$((64 * 1024 * 1024 + 512))
>>
>> echo
>> diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
>> index 22f5ca3ba6..65650fca9a 100755
>> --- a/tests/qemu-iotests/068
>> +++ b/tests/qemu-iotests/068
>> @@ -39,8 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>> # This tests qocw2-specific low-level functionality
>> _supported_fmt qcow2
>> _supported_proto generic
>> +# Internal snapshots are (currently) impossible with refcount_bits=1
> Why currently? 1 bit will only allow to mark a cluser as used/unused which
> is not enough for any snapshots?
It is, because in theory you can just copy the clusters at the time of
snapshotting. We’ll never implement it, but, well...
>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>>
>> -IMGOPTS="compat=1.1"
>> IMG_SIZE=128K
>>
>> case "$QEMU_DEFAULT_MACHINE" in
>> diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
>> index 1c1d1c468f..2d68dc7d6c 100755
>> --- a/tests/qemu-iotests/098
>> +++ b/tests/qemu-iotests/098
>> @@ -40,8 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>>
>> _supported_fmt qcow2
>> _supported_proto file
>> -
>> -IMGOPTS="compat=1.1"
>> +_unsupported_imgopts 'compat=0.10'
> Any idea why? I am not familiar with qcow2 well enought to
> know but this misses a comment with justification.
Because the special bdrv_make_empty() version we want to test only works
with qcow2 v3 images.
>>
>> for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
>>
>
>
> Best regards,
> Maxim Levitsky
>
Thanks for reviewing!
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 07/18] iotests: Replace IMGOPTS= by -o
2019-09-29 16:33 ` Maxim Levitsky
@ 2019-09-30 13:00 ` Max Reitz
2019-09-30 14:30 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 13:00 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 2265 bytes --]
On 29.09.19 18:33, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> Tests should not overwrite all user-supplied image options, but only add
>> to it (which will effectively overwrite conflicting values). Accomplish
>> this by passing options to _make_test_img via -o instead of $IMGOPTS.
>>
>> For some tests, there is no functional change because they already only
>> appended options to IMGOPTS. For these, this patch is just a
>> simplification.
>>
>> For others, this is a change, so they now heed user-specified $IMGOPTS.
>> Some of those tests do not work with all image options, though, so we
>> need to disable them accordingly.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> tests/qemu-iotests/031 | 9 ++++---
>> tests/qemu-iotests/039 | 24 ++++++------------
>> tests/qemu-iotests/059 | 18 ++++++-------
>> tests/qemu-iotests/060 | 6 ++---
>> tests/qemu-iotests/061 | 57 ++++++++++++++++++++++--------------------
>> tests/qemu-iotests/079 | 3 +--
>> tests/qemu-iotests/106 | 2 +-
>> tests/qemu-iotests/108 | 2 +-
>> tests/qemu-iotests/112 | 32 ++++++++++++------------
>> tests/qemu-iotests/115 | 3 +--
>> tests/qemu-iotests/121 | 6 ++---
>> tests/qemu-iotests/125 | 2 +-
>> tests/qemu-iotests/137 | 2 +-
>> tests/qemu-iotests/138 | 3 +--
>> tests/qemu-iotests/175 | 2 +-
>> tests/qemu-iotests/190 | 2 +-
>> tests/qemu-iotests/191 | 3 +--
>> tests/qemu-iotests/220 | 4 ++-
>> tests/qemu-iotests/243 | 6 +++--
>> tests/qemu-iotests/244 | 10 +++++---
>> tests/qemu-iotests/250 | 3 +--
>> tests/qemu-iotests/265 | 2 +-
>> 22 files changed, 100 insertions(+), 101 deletions(-)
[...]
>> diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
>> index 325da63a4c..99563bf126 100755
>> --- a/tests/qemu-iotests/039
>> +++ b/tests/qemu-iotests/039
>> @@ -50,8 +50,7 @@ size=128M
>> echo
>> echo "== Checking that image is clean on shutdown =="
>>
>> -IMGOPTS="compat=1.1,lazy_refcounts=on"
>> -_make_test_img $size
>> +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
> Any reason for compat=1.1 here? Other that it was before like that.
Lazy refcounts only work with qcow2 v3 (compat=1.1).
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267
2019-09-29 16:33 ` Maxim Levitsky
@ 2019-09-30 13:01 ` Max Reitz
2019-09-30 14:32 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 13:01 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 2417 bytes --]
On 29.09.19 18:33, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +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 <mreitz@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 95f885442f..529f5f9afe 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
>
> qemu's master (pulled today), don't have iotest 267,
> you probably based this on some not yet merged branch.
> Or I made some mistake with pulling the master branch.
Yep, it’s only in Kevin’s block branch (and thus mine, too). He sent a
pull request for it, which was rejected though (because this test is
broken on anything but x64, but that doesn’t stop this patch).
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 13/18] iotests: Make 091 work with data_file
2019-09-29 16:34 ` Maxim Levitsky
@ 2019-09-30 13:07 ` Max Reitz
0 siblings, 0 replies; 60+ messages in thread
From: Max Reitz @ 2019-09-30 13:07 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 1175 bytes --]
On 29.09.19 18:34, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> The image end offset as reported by qemu-img check is different when
>> using an external data file; we do not care about its value here, so we
>> can just filter it.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> tests/qemu-iotests/091 | 3 ++-
>> tests/qemu-iotests/091.out | 1 -
>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
>> index f4b44659ae..7536ca4607 100755
>> --- a/tests/qemu-iotests/091
>> +++ b/tests/qemu-iotests/091
>> @@ -101,7 +101,8 @@ echo "Check image pattern"
>> ${QEMU_IO} -c "read -P 0x22 0 4M" "${TEST_IMG}" | _filter_testdir | _filter_qemu_io
>>
>> echo "Running 'qemu-img check -r all \$TEST_IMG'"
>> -"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu
>> +"${QEMU_IMG}" check -r all "${TEST_IMG}" 2>&1 | _filter_testdir | _filter_qemu \
>> + | sed '/Image end offset/d'
>
> Maybe use _filter_qemu_img_check instead? I see it actually filters this already.
Uh, nice. Will do, thanks.
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 14/18] iotests: Make 110 work with data_file
2019-09-29 16:34 ` Maxim Levitsky
@ 2019-09-30 13:34 ` Max Reitz
2019-09-30 13:41 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 13:34 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 3715 bytes --]
On 29.09.19 18:34, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> The only difference is that the json:{} filename of the image looks
>> different. We actually do not care about that filename in this test, we
>> are only interested in (1) that there is a json:{} filename, and (2)
>> whether the backing filename can be constructed.
>>
>> So just filter out the json:{} data, thus making this test pass both
>> with and without data_file.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> tests/qemu-iotests/110 | 7 +++++--
>> tests/qemu-iotests/110.out | 4 ++--
>> 2 files changed, 7 insertions(+), 4 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
>> index f78df0e6e1..34459dcd60 100755
>> --- a/tests/qemu-iotests/110
>> +++ b/tests/qemu-iotests/110
>> @@ -67,6 +67,7 @@ echo
>> # Across blkdebug without a config file, you cannot reconstruct filenames, so
>> # qemu is incapable of knowing the directory of the top image from the filename
>> # alone. However, using bdrv_dirname(), it should still work.
>> +# (Filter out the json:{} filename so this test works with external data files)
>> TEST_IMG="json:{
>> 'driver': '$IMGFMT',
>> 'file': {
>> @@ -82,7 +83,8 @@ TEST_IMG="json:{
>> }
>> ]
>> }
>> -}" _img_info | _filter_img_info | grep -v 'backing file format'
>> +}" _img_info | _filter_img_info | grep -v 'backing file format' \
>> + | sed -e 's#^image: json:.*#image: json:{ /* filtered */ }#'
>>
>> echo
>> echo '=== Backing name is always relative to the backed image ==='
>> @@ -114,7 +116,8 @@ TEST_IMG="json:{
>> }
>> ]
>> }
>> -}" _img_info | _filter_img_info | grep -v 'backing file format'
>> +}" _img_info | _filter_img_info | grep -v 'backing file format' \
>> + | sed -e 's#^image: json:.*#image: json:{ /* filtered */ }#'
>>
>>
>> # success, all done
>> diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
>> index f60b26390e..f835553a99 100644
>> --- a/tests/qemu-iotests/110.out
>> +++ b/tests/qemu-iotests/110.out
>> @@ -11,7 +11,7 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
>>
>> === Non-reconstructable filename ===
>>
>> -image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
>> +image: json:{ /* filtered */ }
>> file format: IMGFMT
>> virtual size: 64 MiB (67108864 bytes)
>> backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
>> @@ -22,7 +22,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
>>
>> === Nodes without a common directory ===
>>
>> -image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-
>> threshold": 1}}
>> +image: json:{ /* filtered */ }
>> file format: IMGFMT
>> virtual size: 64 MiB (67108864 bytes)
>> backing file: t.IMGFMT.base (cannot determine actual path)
>
> Again, maybe put that into the common.filter, so new tests won't need to copy&paste this?
Good idea.
> Also maybe remove the image name completely from output, thus not needing the more complex regex?
I’d prefer to still see that there is a json:{} filename instead of a
plain one. (This is important in this test because for plain filenames,
it’s generally easy to reconstruct the backing file path; it’s only
difficult for json:{} filenames.)
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 15/18] iotests: Make 137 work with data_file
2019-09-29 16:38 ` Maxim Levitsky
@ 2019-09-30 13:38 ` Max Reitz
2019-09-30 13:46 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 13:38 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 2575 bytes --]
On 29.09.19 18:38, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> When using an external data file, there are no refcounts for data
>> clusters. We thus have to adjust the corruption test in this patch to
>> not be based around a data cluster allocation, but the L2 table
>> allocation (L2 tables are still refcounted with external data files).
>>
>> Doing so means this test works both with and without external data
>> files.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> tests/qemu-iotests/137 | 10 ++++++----
>> tests/qemu-iotests/137.out | 4 +---
>> 2 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
>> index 6cf2997577..dd3484205e 100755
>> --- a/tests/qemu-iotests/137
>> +++ b/tests/qemu-iotests/137
>> @@ -138,14 +138,16 @@ $QEMU_IO \
>> "$TEST_IMG" 2>&1 | _filter_qemu_io
>>
>> # The dirty bit must not be set
>> -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
>> +# (Filter the external data file bit)
>> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
>> + | sed -e 's/0x4/0x0/'
> Maybe it is better to filter all the feature bits, but the dirty bit,
> since only it is needed here, so that when we start running tests with
> more features, we won't need to do this again?
I’d hate a filter s/[02468ace]$/no dirty bit/ though.
>>
>> # Similarly we can test whether corruption detection has been enabled:
>> -# Create L1/L2, overwrite first entry in refcount block, allocate something.
>> +# Create L1, overwrite refcounts, force allocation of L2 by writing
>> +# data.
>> # Disabling the checks should fail, so the corruption must be detected.
>> _make_test_img 64M
>> -$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io
>> -poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00"
>> +poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00"
>
> I am wondering if there is any better way to do this (regardless of this patch),
> Basically the above code pokes into the 3rd cluster on the disk I *think*, and I don't
> understand why it has to contain refcounts. Hmm...
> First cluster I can guess will have the header, 2nd cluster probably L1 table, and 3rd, refcounts?
> If so, the test should specify that it needs 64K clusters, because the day will come when
> we will need to test this as well, but I guess in a separate patch,
When that day comes, a whole lot of other stuff will break, too.
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 01/18] iotests: Filter refcount_order in 036
2019-09-30 12:43 ` Max Reitz
@ 2019-09-30 13:40 ` Maxim Levitsky
2019-09-30 13:44 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 13:40 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 14:43 +0200, Max Reitz wrote:
> On 29.09.19 18:31, Maxim Levitsky wrote:
> > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > This test can run just fine with other values for refcount_bits, so we
> > > should filter the value from qcow2.py's dump-header.
> > >
> > > (036 currently ignores user-specified image options, but that will be
> > > fixed in the next patch.)
> > >
> > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > ---
> > > tests/qemu-iotests/036 | 9 ++++++---
> > > tests/qemu-iotests/036.out | 6 +++---
> > > 2 files changed, 9 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> > > index f06ff67408..69d0f9f903 100755
> > > --- a/tests/qemu-iotests/036
> > > +++ b/tests/qemu-iotests/036
> > > @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
> > >
> > > # Without feature table
> > > $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
> > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > > _img_info
> > >
> > > # With feature table containing bit 63
> > > @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
> > > echo
> > > _make_test_img 64M
> > > $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
> > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > >
> > > echo
> > > echo === Repair image ===
> > > echo
> > > _check_test_img -r all
> > >
> > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > >
> > > # success, all done
> > > echo "*** done"
> > > diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
> > > index e489b44386..998c2a8a35 100644
> > > --- a/tests/qemu-iotests/036.out
> > > +++ b/tests/qemu-iotests/036.out
> > > @@ -19,7 +19,7 @@ snapshot_offset 0x0
> > > incompatible_features 0x8000000000000000
> > > compatible_features 0x0
> > > autoclear_features 0x0
> > > -refcount_order 4
> > > +refcount_order (filtered)
> > > header_length 104
> > >
> > > qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
> > > @@ -53,7 +53,7 @@ snapshot_offset 0x0
> > > incompatible_features 0x0
> > > compatible_features 0x0
> > > autoclear_features 0x8000000000000000
> > > -refcount_order 4
> > > +refcount_order (filtered)
> > > header_length 104
> > >
> > > Header extension:
> > > @@ -81,7 +81,7 @@ snapshot_offset 0x0
> > > incompatible_features 0x0
> > > compatible_features 0x0
> > > autoclear_features 0x0
> > > -refcount_order 4
> > > +refcount_order (filtered)
> > > header_length 104
> > >
> > > Header extension:
> >
> > Minor notes:
> >
> > 1. Maybe put the sed command into a function to avoid duplication?
>
> Hm, maybe, but that would increase the LoC, so I’m not sure whether it
> really would be a simplification.
IMHO, in my opinion, regardless of LOC, duplicated code is almost always
bad. Common functions are mostly for the next guy that will be able to use
them instead of searching through code to see how this is done there and there.
>
> > 2. As I understand the test, it only checks the feature bits.
> > So maybe instead of blacklisting some of the values, white list
> > only the feature bits in the output?
>
> Hm. Seems reasonable, but then again I’d prefer a minimal change, and
> changing it to a whitelist would be more change...
I don't think this is bad, again in my eyes, the code should be as friendly
as possible for the next guy that will have to change it, so adding
some more extra changes don't seem a problem to me.
Of course this is only my personal option and each approach has its own cons,
and pros. This doesn't matter that much to me.
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 14/18] iotests: Make 110 work with data_file
2019-09-30 13:34 ` Max Reitz
@ 2019-09-30 13:41 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 13:41 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 15:34 +0200, Max Reitz wrote:
> On 29.09.19 18:34, Maxim Levitsky wrote:
> > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > The only difference is that the json:{} filename of the image looks
> > > different. We actually do not care about that filename in this test, we
> > > are only interested in (1) that there is a json:{} filename, and (2)
> > > whether the backing filename can be constructed.
> > >
> > > So just filter out the json:{} data, thus making this test pass both
> > > with and without data_file.
> > >
> > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > ---
> > > tests/qemu-iotests/110 | 7 +++++--
> > > tests/qemu-iotests/110.out | 4 ++--
> > > 2 files changed, 7 insertions(+), 4 deletions(-)
> > >
> > > diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
> > > index f78df0e6e1..34459dcd60 100755
> > > --- a/tests/qemu-iotests/110
> > > +++ b/tests/qemu-iotests/110
> > > @@ -67,6 +67,7 @@ echo
> > > # Across blkdebug without a config file, you cannot reconstruct filenames, so
> > > # qemu is incapable of knowing the directory of the top image from the filename
> > > # alone. However, using bdrv_dirname(), it should still work.
> > > +# (Filter out the json:{} filename so this test works with external data files)
> > > TEST_IMG="json:{
> > > 'driver': '$IMGFMT',
> > > 'file': {
> > > @@ -82,7 +83,8 @@ TEST_IMG="json:{
> > > }
> > > ]
> > > }
> > > -}" _img_info | _filter_img_info | grep -v 'backing file format'
> > > +}" _img_info | _filter_img_info | grep -v 'backing file format' \
> > > + | sed -e 's#^image: json:.*#image: json:{ /* filtered */ }#'
> > >
> > > echo
> > > echo '=== Backing name is always relative to the backed image ==='
> > > @@ -114,7 +116,8 @@ TEST_IMG="json:{
> > > }
> > > ]
> > > }
> > > -}" _img_info | _filter_img_info | grep -v 'backing file format'
> > > +}" _img_info | _filter_img_info | grep -v 'backing file format' \
> > > + | sed -e 's#^image: json:.*#image: json:{ /* filtered */ }#'
> > >
> > >
> > > # success, all done
> > > diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
> > > index f60b26390e..f835553a99 100644
> > > --- a/tests/qemu-iotests/110.out
> > > +++ b/tests/qemu-iotests/110.out
> > > @@ -11,7 +11,7 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
> > >
> > > === Non-reconstructable filename ===
> > >
> > > -image: json:{"driver": "IMGFMT", "file": {"set-state.0.event": "read_aio", "image": {"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, "driver": "blkdebug", "set-state.0.new_state": 42}}
> > > +image: json:{ /* filtered */ }
> > > file format: IMGFMT
> > > virtual size: 64 MiB (67108864 bytes)
> > > backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
> > > @@ -22,7 +22,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.b
> > >
> > > === Nodes without a common directory ===
> > >
> > > -image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "vote-
> > > threshold": 1}}
> > > +image: json:{ /* filtered */ }
> > > file format: IMGFMT
> > > virtual size: 64 MiB (67108864 bytes)
> > > backing file: t.IMGFMT.base (cannot determine actual path)
> >
> > Again, maybe put that into the common.filter, so new tests won't need to copy&paste this?
>
> Good idea.
>
> > Also maybe remove the image name completely from output, thus not needing the more complex regex?
>
> I’d prefer to still see that there is a json:{} filename instead of a
> plain one. (This is important in this test because for plain filenames,
> it’s generally easy to reconstruct the backing file path; it’s only
> difficult for json:{} filenames.)
All right, seems good.
Best regards,
Maxim Levitsky
>
> Max
>
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 18/18] iotests: Allow check -o data_file
2019-09-29 16:39 ` Maxim Levitsky
@ 2019-09-30 13:43 ` Max Reitz
0 siblings, 0 replies; 60+ messages in thread
From: Max Reitz @ 2019-09-30 13:43 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 4853 bytes --]
On 29.09.19 18:39, Maxim Levitsky wrote:
> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>> The problem with allowing the data_file option is that you want to use a
>> different data file per image used in the test. Therefore, we need to
>> allow patterns like -o data_file='$TEST_IMG.data_file'.
>>
>> Then, we need to filter it out from qemu-img map, qemu-img create, and
>> remove the data file in _rm_test_img.
>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>> tests/qemu-iotests/common.filter | 21 +++++++++++++++++++--
>> tests/qemu-iotests/common.rc | 10 +++++++++-
>> 2 files changed, 28 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
>> index 841f7642af..a11f9a8972 100644
>> --- a/tests/qemu-iotests/common.filter
>> +++ b/tests/qemu-iotests/common.filter
>> @@ -115,7 +115,15 @@ _filter_actual_image_size()
>> # replace driver-specific options in the "Formatting..." line
>> _filter_img_create()
>> {
>> - $SED -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
>> + data_file_filter=()
>> + if echo "$IMGOPTS" | grep -q 'data_file='; then
>> + data_file=$(echo "$IMGOPTS" | sed -e 's/.*\(data_file=[^,]*\).*/\1/' \
>> + -e "s#\\\$TEST_IMG#$TEST_IMG#")
> Could you maybe add a comment on this regular expression, similar
> to what is in the commit message?
>
>> + data_file_filter=(-e "s# $data_file##")
> Why to use array here? A variable would work too I think.
Because I find it to be much simpler to quote correctly.
>> + fi
>> +
>> + $SED "${data_file_filter[@]}" \
>> + -e "s#$REMOTE_TEST_DIR#TEST_DIR#g" \
>> -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" \
>> -e "s#$TEST_DIR#TEST_DIR#g" \
>> -e "s#$IMGFMT#IMGFMT#g" \
>> @@ -198,9 +206,18 @@ _filter_img_info()
>> # human and json output
>> _filter_qemu_img_map()
>> {
>> + data_file_filter=()
>> + if echo "$IMGOPTS" | grep -q 'data_file='; then
>> + data_file_pattern=$(echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \
>> + -e 's#\$TEST_IMG#\\(.*\\)#')
>> + data_file_filter=(-e "s#$data_file_pattern#\\1#")
> Seems to do the same thing, but in slightly different way.
It does a very different thing, in that it creates a sed pattern.
I’d first need to get comfortable with the thought of having a common
function _data_file_from_imgopts and then pass a '\(.*\)' to it, which
would look weird.
Or maybe even a '\\(.*\\)', because I’d still have to take the sed
escaping into account, even in that function’s caller, which is weird, too.
> Maybe make a function to avoid duplication?
> I am not 100% sure though.
>
>> + fi
>> +
>> $SED -e 's/\([0-9a-fx]* *[0-9a-fx]* *\)[0-9a-fx]* */\1/g' \
>> -e 's/"offset": [0-9]\+/"offset": OFFSET/g' \
>> - -e 's/Mapped to *//' | _filter_testdir | _filter_imgfmt
>> + -e 's/Mapped to *//' \
>> + "${data_file_filter[@]}" \
>> + | _filter_testdir | _filter_imgfmt
>> }
>>
>> _filter_nbd()
>> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
>> index f3784077de..834ece12e4 100644
>> --- a/tests/qemu-iotests/common.rc
>> +++ b/tests/qemu-iotests/common.rc
>> @@ -297,7 +297,8 @@ _make_test_img()
>> fi
>>
>> if [ -n "$IMGOPTS" ]; then
>> - optstr=$(_optstr_add "$optstr" "$IMGOPTS")
>> + imgopts_expanded=$(echo "$IMGOPTS" | sed -e "s#\\\$TEST_IMG#$img_name#")
>> + optstr=$(_optstr_add "$optstr" "$imgopts_expanded")
> Also a comment explaining why this is needed would be welcome.
>
>> fi
>> if [ -n "$IMGKEYSECRET" ]; then
>> object_options="--object secret,id=keysec0,data=$IMGKEYSECRET"
>> @@ -376,6 +377,13 @@ _rm_test_img()
>> # Remove all the extents for vmdk
>> "$QEMU_IMG" info "$img" 2>/dev/null | grep 'filename:' | cut -f 2 -d: \
>> | xargs -I {} rm -f "{}"
>> + elif [ "$IMGFMT" = "qcow2" ]; then
>> + # Remove external data file
>> + if echo "$IMGOPTS" | grep -q 'data_file='; then
>> + data_file=$(echo "$IMGOPTS" | sed -e 's/.*data_file=\([^,]*\).*/\1/' \
>> + -e "s#\\\$TEST_IMG#$img#")
> Same here, even more evidence that it would be nice to move this to a common function.
I’m not sure whether it’s more evidence because it would increase LoC.
I may or may not do it.
Max
> Again, I am not 100% sure that this is the same regex, but it looks like that.
>
>> + rm -f "$data_file"
>> + fi
>> fi
>> rm -f "$img"
>> }
>
>
> Best regards,
> Maxim Levitsky
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 01/18] iotests: Filter refcount_order in 036
2019-09-30 13:40 ` Maxim Levitsky
@ 2019-09-30 13:44 ` Max Reitz
2019-09-30 13:58 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 13:44 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 4609 bytes --]
On 30.09.19 15:40, Maxim Levitsky wrote:
> On Mon, 2019-09-30 at 14:43 +0200, Max Reitz wrote:
>> On 29.09.19 18:31, Maxim Levitsky wrote:
>>> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>>>> This test can run just fine with other values for refcount_bits, so we
>>>> should filter the value from qcow2.py's dump-header.
>>>>
>>>> (036 currently ignores user-specified image options, but that will be
>>>> fixed in the next patch.)
>>>>
>>>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>>>> ---
>>>> tests/qemu-iotests/036 | 9 ++++++---
>>>> tests/qemu-iotests/036.out | 6 +++---
>>>> 2 files changed, 9 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
>>>> index f06ff67408..69d0f9f903 100755
>>>> --- a/tests/qemu-iotests/036
>>>> +++ b/tests/qemu-iotests/036
>>>> @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
>>>>
>>>> # Without feature table
>>>> $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
>>>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>>>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>>>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>>>> _img_info
>>>>
>>>> # With feature table containing bit 63
>>>> @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
>>>> echo
>>>> _make_test_img 64M
>>>> $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
>>>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>>>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>>>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>>>>
>>>> echo
>>>> echo === Repair image ===
>>>> echo
>>>> _check_test_img -r all
>>>>
>>>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>>>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>>>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>>>>
>>>> # success, all done
>>>> echo "*** done"
>>>> diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
>>>> index e489b44386..998c2a8a35 100644
>>>> --- a/tests/qemu-iotests/036.out
>>>> +++ b/tests/qemu-iotests/036.out
>>>> @@ -19,7 +19,7 @@ snapshot_offset 0x0
>>>> incompatible_features 0x8000000000000000
>>>> compatible_features 0x0
>>>> autoclear_features 0x0
>>>> -refcount_order 4
>>>> +refcount_order (filtered)
>>>> header_length 104
>>>>
>>>> qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
>>>> @@ -53,7 +53,7 @@ snapshot_offset 0x0
>>>> incompatible_features 0x0
>>>> compatible_features 0x0
>>>> autoclear_features 0x8000000000000000
>>>> -refcount_order 4
>>>> +refcount_order (filtered)
>>>> header_length 104
>>>>
>>>> Header extension:
>>>> @@ -81,7 +81,7 @@ snapshot_offset 0x0
>>>> incompatible_features 0x0
>>>> compatible_features 0x0
>>>> autoclear_features 0x0
>>>> -refcount_order 4
>>>> +refcount_order (filtered)
>>>> header_length 104
>>>>
>>>> Header extension:
>>>
>>> Minor notes:
>>>
>>> 1. Maybe put the sed command into a function to avoid duplication?
>>
>> Hm, maybe, but that would increase the LoC, so I’m not sure whether it
>> really would be a simplification.
> IMHO, in my opinion, regardless of LOC, duplicated code is almost always
> bad. Common functions are mostly for the next guy that will be able to use
> them instead of searching through code to see how this is done there and there.
In my experience, people write tests without scanning common.filter for
whether anyone has written the same code already. See the
_filter_qemu_img_check example in this series.
>>
>>> 2. As I understand the test, it only checks the feature bits.
>>> So maybe instead of blacklisting some of the values, white list
>>> only the feature bits in the output?
>>
>> Hm. Seems reasonable, but then again I’d prefer a minimal change, and
>> changing it to a whitelist would be more change...
> I don't think this is bad, again in my eyes, the code should be as friendly
> as possible for the next guy that will have to change it, so adding
> some more extra changes don't seem a problem to me.
In my eyes tests aren’t code.
Max
> Of course this is only my personal option and each approach has its own cons,
> and pros. This doesn't matter that much to me.
>
> Best regards,
> Maxim Levitsky
>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 15/18] iotests: Make 137 work with data_file
2019-09-30 13:38 ` Max Reitz
@ 2019-09-30 13:46 ` Maxim Levitsky
2019-09-30 13:57 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 13:46 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 15:38 +0200, Max Reitz wrote:
> On 29.09.19 18:38, Maxim Levitsky wrote:
> > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > When using an external data file, there are no refcounts for data
> > > clusters. We thus have to adjust the corruption test in this patch to
> > > not be based around a data cluster allocation, but the L2 table
> > > allocation (L2 tables are still refcounted with external data files).
> > >
> > > Doing so means this test works both with and without external data
> > > files.
> > >
> > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > ---
> > > tests/qemu-iotests/137 | 10 ++++++----
> > > tests/qemu-iotests/137.out | 4 +---
> > > 2 files changed, 7 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
> > > index 6cf2997577..dd3484205e 100755
> > > --- a/tests/qemu-iotests/137
> > > +++ b/tests/qemu-iotests/137
> > > @@ -138,14 +138,16 @@ $QEMU_IO \
> > > "$TEST_IMG" 2>&1 | _filter_qemu_io
> > >
> > > # The dirty bit must not be set
> > > -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
> > > +# (Filter the external data file bit)
> > > +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
> > > + | sed -e 's/0x4/0x0/'
> >
> > Maybe it is better to filter all the feature bits, but the dirty bit,
> > since only it is needed here, so that when we start running tests with
> > more features, we won't need to do this again?
>
> I’d hate a filter s/[02468ace]$/no dirty bit/ though.
Nothing a helper function can't solve IMHO, I would convert this to a number,
and then check bitwise the bit 2, assuming that is the dirty bit)
Again, note that my approach to code is to make it as easy as possible for the
next guy to change, so I am noticing such places. Eventually someone of us,
will be that next guy. Then again, I don't mind leaving this as is, just noting this.
>
> > >
> > > # Similarly we can test whether corruption detection has been enabled:
> > > -# Create L1/L2, overwrite first entry in refcount block, allocate something.
> > > +# Create L1, overwrite refcounts, force allocation of L2 by writing
> > > +# data.
> > > # Disabling the checks should fail, so the corruption must be detected.
> > > _make_test_img 64M
> > > -$QEMU_IO -c "write 0 64k" "$TEST_IMG" | _filter_qemu_io
> > > -poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00"
> > > +poke_file "$TEST_IMG" "$((0x20000))" "\x00\x00\x00\x00\x00\x00\x00\x00"
> >
> > I am wondering if there is any better way to do this (regardless of this patch),
> > Basically the above code pokes into the 3rd cluster on the disk I *think*, and I don't
> > understand why it has to contain refcounts. Hmm...
> > First cluster I can guess will have the header, 2nd cluster probably L1 table, and 3rd, refcounts?
> > If so, the test should specify that it needs 64K clusters, because the day will come when
> > we will need to test this as well, but I guess in a separate patch,
>
> When that day comes, a whole lot of other stuff will break, too.
I guess so, won't argue about this one.
Best regards,
Maxim Levitsky
>
> Max
>
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 15/18] iotests: Make 137 work with data_file
2019-09-30 13:46 ` Maxim Levitsky
@ 2019-09-30 13:57 ` Max Reitz
2019-09-30 14:06 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 13:57 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 2689 bytes --]
On 30.09.19 15:46, Maxim Levitsky wrote:
> On Mon, 2019-09-30 at 15:38 +0200, Max Reitz wrote:
>> On 29.09.19 18:38, Maxim Levitsky wrote:
>>> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>>>> When using an external data file, there are no refcounts for data
>>>> clusters. We thus have to adjust the corruption test in this patch to
>>>> not be based around a data cluster allocation, but the L2 table
>>>> allocation (L2 tables are still refcounted with external data files).
>>>>
>>>> Doing so means this test works both with and without external data
>>>> files.
>>>>
>>>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>>>> ---
>>>> tests/qemu-iotests/137 | 10 ++++++----
>>>> tests/qemu-iotests/137.out | 4 +---
>>>> 2 files changed, 7 insertions(+), 7 deletions(-)
>>>>
>>>> diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
>>>> index 6cf2997577..dd3484205e 100755
>>>> --- a/tests/qemu-iotests/137
>>>> +++ b/tests/qemu-iotests/137
>>>> @@ -138,14 +138,16 @@ $QEMU_IO \
>>>> "$TEST_IMG" 2>&1 | _filter_qemu_io
>>>>
>>>> # The dirty bit must not be set
>>>> -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
>>>> +# (Filter the external data file bit)
>>>> +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
>>>> + | sed -e 's/0x4/0x0/'
>>>
>>> Maybe it is better to filter all the feature bits, but the dirty bit,
>>> since only it is needed here, so that when we start running tests with
>>> more features, we won't need to do this again?
>>
>> I’d hate a filter s/[02468ace]$/no dirty bit/ though.
> Nothing a helper function can't solve IMHO, I would convert this to a number,
> and then check bitwise the bit 2, assuming that is the dirty bit)
> Again, note that my approach to code is to make it as easy as possible for the
> next guy to change, so I am noticing such places. Eventually someone of us,
> will be that next guy. Then again, I don't mind leaving this as is, just noting this.
Again, my approach to tests is that they aren’t classical code.
This is a very personal opinion, but I have found that tests that have
the most ad-hoc code with the least function calls are the easiest to
work with.
Tests that have a whole lot of infrastructure and try to have nice code
are a horror to work with because you first have to understand how they
work.
Tests should be simple, not complex. Some ad-hoc filters do not make
them complex as long as it’s obvious what they do.
Also, the correct approach here is not to do number crunching in bash.
It is to change qcow2.py to emit more easily filterable information.
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 01/18] iotests: Filter refcount_order in 036
2019-09-30 13:44 ` Max Reitz
@ 2019-09-30 13:58 ` Maxim Levitsky
2019-09-30 14:04 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 13:58 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 15:44 +0200, Max Reitz wrote:
> On 30.09.19 15:40, Maxim Levitsky wrote:
> > On Mon, 2019-09-30 at 14:43 +0200, Max Reitz wrote:
> > > On 29.09.19 18:31, Maxim Levitsky wrote:
> > > > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > > > This test can run just fine with other values for refcount_bits, so we
> > > > > should filter the value from qcow2.py's dump-header.
> > > > >
> > > > > (036 currently ignores user-specified image options, but that will be
> > > > > fixed in the next patch.)
> > > > >
> > > > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > > > ---
> > > > > tests/qemu-iotests/036 | 9 ++++++---
> > > > > tests/qemu-iotests/036.out | 6 +++---
> > > > > 2 files changed, 9 insertions(+), 6 deletions(-)
> > > > >
> > > > > diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> > > > > index f06ff67408..69d0f9f903 100755
> > > > > --- a/tests/qemu-iotests/036
> > > > > +++ b/tests/qemu-iotests/036
> > > > > @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
> > > > >
> > > > > # Without feature table
> > > > > $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
> > > > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > > > > _img_info
> > > > >
> > > > > # With feature table containing bit 63
> > > > > @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
> > > > > echo
> > > > > _make_test_img 64M
> > > > > $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
> > > > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > > > >
> > > > > echo
> > > > > echo === Repair image ===
> > > > > echo
> > > > > _check_test_img -r all
> > > > >
> > > > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > > > >
> > > > > # success, all done
> > > > > echo "*** done"
> > > > > diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
> > > > > index e489b44386..998c2a8a35 100644
> > > > > --- a/tests/qemu-iotests/036.out
> > > > > +++ b/tests/qemu-iotests/036.out
> > > > > @@ -19,7 +19,7 @@ snapshot_offset 0x0
> > > > > incompatible_features 0x8000000000000000
> > > > > compatible_features 0x0
> > > > > autoclear_features 0x0
> > > > > -refcount_order 4
> > > > > +refcount_order (filtered)
> > > > > header_length 104
> > > > >
> > > > > qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
> > > > > @@ -53,7 +53,7 @@ snapshot_offset 0x0
> > > > > incompatible_features 0x0
> > > > > compatible_features 0x0
> > > > > autoclear_features 0x8000000000000000
> > > > > -refcount_order 4
> > > > > +refcount_order (filtered)
> > > > > header_length 104
> > > > >
> > > > > Header extension:
> > > > > @@ -81,7 +81,7 @@ snapshot_offset 0x0
> > > > > incompatible_features 0x0
> > > > > compatible_features 0x0
> > > > > autoclear_features 0x0
> > > > > -refcount_order 4
> > > > > +refcount_order (filtered)
> > > > > header_length 104
> > > > >
> > > > > Header extension:
> > > >
> > > > Minor notes:
> > > >
> > > > 1. Maybe put the sed command into a function to avoid duplication?
> > >
> > > Hm, maybe, but that would increase the LoC, so I’m not sure whether it
> > > really would be a simplification.
> >
> > IMHO, in my opinion, regardless of LOC, duplicated code is almost always
> > bad. Common functions are mostly for the next guy that will be able to use
> > them instead of searching through code to see how this is done there and there.
>
> In my experience, people write tests without scanning common.filter for
> whether anyone has written the same code already. See the
> _filter_qemu_img_check example in this series.
Fair enough, but this can change.
>
> > >
> > > > 2. As I understand the test, it only checks the feature bits.
> > > > So maybe instead of blacklisting some of the values, white list
> > > > only the feature bits in the output?
> > >
> > > Hm. Seems reasonable, but then again I’d prefer a minimal change, and
> > > changing it to a whitelist would be more change...
> >
> > I don't think this is bad, again in my eyes, the code should be as friendly
> > as possible for the next guy that will have to change it, so adding
> > some more extra changes don't seem a problem to me.
>
> In my eyes tests aren’t code.
And yet, writing tests is commonly known as a task
that developers don't really like to do, so making that even a tiniest bit
easier, is a good thing IMHO,
Anyway I won't argue about this too much, and on top of this,
I think that this patch series does *lot* of improvements that
do make it easier to write the tests.
Thanks for that, and I might also someday in the future do
some refactoring for the iotests. The thing that I hate the
most is that the tests don't have names....
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 01/18] iotests: Filter refcount_order in 036
2019-09-30 13:58 ` Maxim Levitsky
@ 2019-09-30 14:04 ` Max Reitz
2019-09-30 14:14 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 14:04 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 5917 bytes --]
On 30.09.19 15:58, Maxim Levitsky wrote:
> On Mon, 2019-09-30 at 15:44 +0200, Max Reitz wrote:
>> On 30.09.19 15:40, Maxim Levitsky wrote:
>>> On Mon, 2019-09-30 at 14:43 +0200, Max Reitz wrote:
>>>> On 29.09.19 18:31, Maxim Levitsky wrote:
>>>>> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>>>>>> This test can run just fine with other values for refcount_bits, so we
>>>>>> should filter the value from qcow2.py's dump-header.
>>>>>>
>>>>>> (036 currently ignores user-specified image options, but that will be
>>>>>> fixed in the next patch.)
>>>>>>
>>>>>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>>>>>> ---
>>>>>> tests/qemu-iotests/036 | 9 ++++++---
>>>>>> tests/qemu-iotests/036.out | 6 +++---
>>>>>> 2 files changed, 9 insertions(+), 6 deletions(-)
>>>>>>
>>>>>> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
>>>>>> index f06ff67408..69d0f9f903 100755
>>>>>> --- a/tests/qemu-iotests/036
>>>>>> +++ b/tests/qemu-iotests/036
>>>>>> @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
>>>>>>
>>>>>> # Without feature table
>>>>>> $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
>>>>>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>>>>>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>>>>>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>>>>>> _img_info
>>>>>>
>>>>>> # With feature table containing bit 63
>>>>>> @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
>>>>>> echo
>>>>>> _make_test_img 64M
>>>>>> $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
>>>>>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>>>>>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>>>>>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>>>>>>
>>>>>> echo
>>>>>> echo === Repair image ===
>>>>>> echo
>>>>>> _check_test_img -r all
>>>>>>
>>>>>> -$PYTHON qcow2.py "$TEST_IMG" dump-header
>>>>>> +$PYTHON qcow2.py "$TEST_IMG" dump-header \
>>>>>> + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
>>>>>>
>>>>>> # success, all done
>>>>>> echo "*** done"
>>>>>> diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
>>>>>> index e489b44386..998c2a8a35 100644
>>>>>> --- a/tests/qemu-iotests/036.out
>>>>>> +++ b/tests/qemu-iotests/036.out
>>>>>> @@ -19,7 +19,7 @@ snapshot_offset 0x0
>>>>>> incompatible_features 0x8000000000000000
>>>>>> compatible_features 0x0
>>>>>> autoclear_features 0x0
>>>>>> -refcount_order 4
>>>>>> +refcount_order (filtered)
>>>>>> header_length 104
>>>>>>
>>>>>> qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
>>>>>> @@ -53,7 +53,7 @@ snapshot_offset 0x0
>>>>>> incompatible_features 0x0
>>>>>> compatible_features 0x0
>>>>>> autoclear_features 0x8000000000000000
>>>>>> -refcount_order 4
>>>>>> +refcount_order (filtered)
>>>>>> header_length 104
>>>>>>
>>>>>> Header extension:
>>>>>> @@ -81,7 +81,7 @@ snapshot_offset 0x0
>>>>>> incompatible_features 0x0
>>>>>> compatible_features 0x0
>>>>>> autoclear_features 0x0
>>>>>> -refcount_order 4
>>>>>> +refcount_order (filtered)
>>>>>> header_length 104
>>>>>>
>>>>>> Header extension:
>>>>>
>>>>> Minor notes:
>>>>>
>>>>> 1. Maybe put the sed command into a function to avoid duplication?
>>>>
>>>> Hm, maybe, but that would increase the LoC, so I’m not sure whether it
>>>> really would be a simplification.
>>>
>>> IMHO, in my opinion, regardless of LOC, duplicated code is almost always
>>> bad. Common functions are mostly for the next guy that will be able to use
>>> them instead of searching through code to see how this is done there and there.
>>
>> In my experience, people write tests without scanning common.filter for
>> whether anyone has written the same code already. See the
>> _filter_qemu_img_check example in this series.
> Fair enough, but this can change.
It won’t.
It only changes when people use standardized functions that filter
automatically. And writing that made me look into common.rc, and ah
yes, we have a _check_test_img. So the correct thing to do is not to
use _filter_qemu_img_check (or to expect people to scan the filter file
for filters), but to use _check_test_img there.
>>>>> 2. As I understand the test, it only checks the feature bits.
>>>>> So maybe instead of blacklisting some of the values, white list
>>>>> only the feature bits in the output?
>>>>
>>>> Hm. Seems reasonable, but then again I’d prefer a minimal change, and
>>>> changing it to a whitelist would be more change...
>>>
>>> I don't think this is bad, again in my eyes, the code should be as friendly
>>> as possible for the next guy that will have to change it, so adding
>>> some more extra changes don't seem a problem to me.
>>
>> In my eyes tests aren’t code.
>
> And yet, writing tests is commonly known as a task
> that developers don't really like to do, so making that even a tiniest bit
> easier, is a good thing IMHO,
My problem is precisely that I don’t see how such a suggestion makes it
easier to write test code.
The easiest way to write a test is to just dump ad-hoc code into a bash
file. Sometimes that doesn’t work because what you want to test is more
complex, so then you use Python.
What I felt you were arguing about is changing existing test code, which
is a completely different thing. In my experience, that happens much
more rarely and is thus a thing we don’t need to optimize for. (And I’m
saying this as the one who wrote this series which is just about
changing existing test code.)
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 15/18] iotests: Make 137 work with data_file
2019-09-30 13:57 ` Max Reitz
@ 2019-09-30 14:06 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 14:06 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 15:57 +0200, Max Reitz wrote:
> On 30.09.19 15:46, Maxim Levitsky wrote:
> > On Mon, 2019-09-30 at 15:38 +0200, Max Reitz wrote:
> > > On 29.09.19 18:38, Maxim Levitsky wrote:
> > > > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > > > When using an external data file, there are no refcounts for data
> > > > > clusters. We thus have to adjust the corruption test in this patch to
> > > > > not be based around a data cluster allocation, but the L2 table
> > > > > allocation (L2 tables are still refcounted with external data files).
> > > > >
> > > > > Doing so means this test works both with and without external data
> > > > > files.
> > > > >
> > > > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > > > ---
> > > > > tests/qemu-iotests/137 | 10 ++++++----
> > > > > tests/qemu-iotests/137.out | 4 +---
> > > > > 2 files changed, 7 insertions(+), 7 deletions(-)
> > > > >
> > > > > diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
> > > > > index 6cf2997577..dd3484205e 100755
> > > > > --- a/tests/qemu-iotests/137
> > > > > +++ b/tests/qemu-iotests/137
> > > > > @@ -138,14 +138,16 @@ $QEMU_IO \
> > > > > "$TEST_IMG" 2>&1 | _filter_qemu_io
> > > > >
> > > > > # The dirty bit must not be set
> > > > > -$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features
> > > > > +# (Filter the external data file bit)
> > > > > +$PYTHON qcow2.py "$TEST_IMG" dump-header | grep incompatible_features \
> > > > > + | sed -e 's/0x4/0x0/'
> > > >
> > > > Maybe it is better to filter all the feature bits, but the dirty bit,
> > > > since only it is needed here, so that when we start running tests with
> > > > more features, we won't need to do this again?
> > >
> > > I’d hate a filter s/[02468ace]$/no dirty bit/ though.
> >
> > Nothing a helper function can't solve IMHO, I would convert this to a number,
> > and then check bitwise the bit 2, assuming that is the dirty bit)
> > Again, note that my approach to code is to make it as easy as possible for the
> > next guy to change, so I am noticing such places. Eventually someone of us,
> > will be that next guy. Then again, I don't mind leaving this as is, just noting this.
>
> Again, my approach to tests is that they aren’t classical code.
>
> This is a very personal opinion, but I have found that tests that have
> the most ad-hoc code with the least function calls are the easiest to
> work with.
>
> Tests that have a whole lot of infrastructure and try to have nice code
> are a horror to work with because you first have to understand how they
> work.
I guess everything should be in balance, but I understand very well
what you mean.
>
> Tests should be simple, not complex. Some ad-hoc filters do not make
> them complex as long as it’s obvious what they do.
Yea, but the point is that it makes it harder to test new features,
that slightly change the output of the tests, and break various tests that hardcode unneeded things.
Pretty much exactly what this patch series does,
is to remove some of the ad-hoc stuff to make the
tests work with a new feature.
A bit more generic tests, might be able
to reduce this work. Anyway I won't argue with this as well, its all matter of
balance, both extremes are no doubt bad.
>
>
> Also, the correct approach here is not to do number crunching in bash.
> It is to change qcow2.py to emit more easily filterable information.
100% agree.
>
> Max
>
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 01/18] iotests: Filter refcount_order in 036
2019-09-30 14:04 ` Max Reitz
@ 2019-09-30 14:14 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 14:14 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 16:04 +0200, Max Reitz wrote:
> On 30.09.19 15:58, Maxim Levitsky wrote:
> > On Mon, 2019-09-30 at 15:44 +0200, Max Reitz wrote:
> > > On 30.09.19 15:40, Maxim Levitsky wrote:
> > > > On Mon, 2019-09-30 at 14:43 +0200, Max Reitz wrote:
> > > > > On 29.09.19 18:31, Maxim Levitsky wrote:
> > > > > > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > > > > > This test can run just fine with other values for refcount_bits, so we
> > > > > > > should filter the value from qcow2.py's dump-header.
> > > > > > >
> > > > > > > (036 currently ignores user-specified image options, but that will be
> > > > > > > fixed in the next patch.)
> > > > > > >
> > > > > > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > > > > > ---
> > > > > > > tests/qemu-iotests/036 | 9 ++++++---
> > > > > > > tests/qemu-iotests/036.out | 6 +++---
> > > > > > > 2 files changed, 9 insertions(+), 6 deletions(-)
> > > > > > >
> > > > > > > diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> > > > > > > index f06ff67408..69d0f9f903 100755
> > > > > > > --- a/tests/qemu-iotests/036
> > > > > > > +++ b/tests/qemu-iotests/036
> > > > > > > @@ -55,7 +55,8 @@ $PYTHON qcow2.py "$TEST_IMG" set-feature-bit incompatible 63
> > > > > > >
> > > > > > > # Without feature table
> > > > > > > $PYTHON qcow2.py "$TEST_IMG" del-header-ext 0x6803f857
> > > > > > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > > > > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > > > > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > > > > > > _img_info
> > > > > > >
> > > > > > > # With feature table containing bit 63
> > > > > > > @@ -103,14 +104,16 @@ echo === Create image with unknown autoclear feature bit ===
> > > > > > > echo
> > > > > > > _make_test_img 64M
> > > > > > > $PYTHON qcow2.py "$TEST_IMG" set-feature-bit autoclear 63
> > > > > > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > > > > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > > > > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > > > > > >
> > > > > > > echo
> > > > > > > echo === Repair image ===
> > > > > > > echo
> > > > > > > _check_test_img -r all
> > > > > > >
> > > > > > > -$PYTHON qcow2.py "$TEST_IMG" dump-header
> > > > > > > +$PYTHON qcow2.py "$TEST_IMG" dump-header \
> > > > > > > + | sed -e 's/^\(refcount_order\s*\).*/\1(filtered)/'
> > > > > > >
> > > > > > > # success, all done
> > > > > > > echo "*** done"
> > > > > > > diff --git a/tests/qemu-iotests/036.out b/tests/qemu-iotests/036.out
> > > > > > > index e489b44386..998c2a8a35 100644
> > > > > > > --- a/tests/qemu-iotests/036.out
> > > > > > > +++ b/tests/qemu-iotests/036.out
> > > > > > > @@ -19,7 +19,7 @@ snapshot_offset 0x0
> > > > > > > incompatible_features 0x8000000000000000
> > > > > > > compatible_features 0x0
> > > > > > > autoclear_features 0x0
> > > > > > > -refcount_order 4
> > > > > > > +refcount_order (filtered)
> > > > > > > header_length 104
> > > > > > >
> > > > > > > qemu-img: Could not open 'TEST_DIR/t.IMGFMT': Unsupported IMGFMT feature(s): Unknown incompatible feature: 8000000000000000
> > > > > > > @@ -53,7 +53,7 @@ snapshot_offset 0x0
> > > > > > > incompatible_features 0x0
> > > > > > > compatible_features 0x0
> > > > > > > autoclear_features 0x8000000000000000
> > > > > > > -refcount_order 4
> > > > > > > +refcount_order (filtered)
> > > > > > > header_length 104
> > > > > > >
> > > > > > > Header extension:
> > > > > > > @@ -81,7 +81,7 @@ snapshot_offset 0x0
> > > > > > > incompatible_features 0x0
> > > > > > > compatible_features 0x0
> > > > > > > autoclear_features 0x0
> > > > > > > -refcount_order 4
> > > > > > > +refcount_order (filtered)
> > > > > > > header_length 104
> > > > > > >
> > > > > > > Header extension:
> > > > > >
> > > > > > Minor notes:
> > > > > >
> > > > > > 1. Maybe put the sed command into a function to avoid duplication?
> > > > >
> > > > > Hm, maybe, but that would increase the LoC, so I’m not sure whether it
> > > > > really would be a simplification.
> > > >
> > > > IMHO, in my opinion, regardless of LOC, duplicated code is almost always
> > > > bad. Common functions are mostly for the next guy that will be able to use
> > > > them instead of searching through code to see how this is done there and there.
> > >
> > > In my experience, people write tests without scanning common.filter for
> > > whether anyone has written the same code already. See the
> > > _filter_qemu_img_check example in this series.
> >
> > Fair enough, but this can change.
>
> It won’t.
>
> It only changes when people use standardized functions that filter
> automatically. And writing that made me look into common.rc, and ah
> yes, we have a _check_test_img. So the correct thing to do is not to
> use _filter_qemu_img_check (or to expect people to scan the filter file
> for filters), but to use _check_test_img there.
>
> > > > > > 2. As I understand the test, it only checks the feature bits.
> > > > > > So maybe instead of blacklisting some of the values, white list
> > > > > > only the feature bits in the output?
> > > > >
> > > > > Hm. Seems reasonable, but then again I’d prefer a minimal change, and
> > > > > changing it to a whitelist would be more change...
> > > >
> > > > I don't think this is bad, again in my eyes, the code should be as friendly
> > > > as possible for the next guy that will have to change it, so adding
> > > > some more extra changes don't seem a problem to me.
> > >
> > > In my eyes tests aren’t code.
> >
> > And yet, writing tests is commonly known as a task
> > that developers don't really like to do, so making that even a tiniest bit
> > easier, is a good thing IMHO,
>
> My problem is precisely that I don’t see how such a suggestion makes it
> easier to write test code.
>
> The easiest way to write a test is to just dump ad-hoc code into a bash
> file. Sometimes that doesn’t work because what you want to test is more
> complex, so then you use Python.
>
>
> What I felt you were arguing about is changing existing test code, which
> is a completely different thing. In my experience, that happens much
> more rarely and is thus a thing we don’t need to optimize for. (And I’m
> saying this as the one who wrote this series which is just about
> changing existing test code.)
I won't argue on this! It all depends on lot and lot of things.
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 07/18] iotests: Replace IMGOPTS= by -o
2019-09-30 13:00 ` Max Reitz
@ 2019-09-30 14:30 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 14:30 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 15:00 +0200, Max Reitz wrote:
> On 29.09.19 18:33, Maxim Levitsky wrote:
> > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > Tests should not overwrite all user-supplied image options, but only add
> > > to it (which will effectively overwrite conflicting values). Accomplish
> > > this by passing options to _make_test_img via -o instead of $IMGOPTS.
> > >
> > > For some tests, there is no functional change because they already only
> > > appended options to IMGOPTS. For these, this patch is just a
> > > simplification.
> > >
> > > For others, this is a change, so they now heed user-specified $IMGOPTS.
> > > Some of those tests do not work with all image options, though, so we
> > > need to disable them accordingly.
> > >
> > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > ---
> > > tests/qemu-iotests/031 | 9 ++++---
> > > tests/qemu-iotests/039 | 24 ++++++------------
> > > tests/qemu-iotests/059 | 18 ++++++-------
> > > tests/qemu-iotests/060 | 6 ++---
> > > tests/qemu-iotests/061 | 57 ++++++++++++++++++++++--------------------
> > > tests/qemu-iotests/079 | 3 +--
> > > tests/qemu-iotests/106 | 2 +-
> > > tests/qemu-iotests/108 | 2 +-
> > > tests/qemu-iotests/112 | 32 ++++++++++++------------
> > > tests/qemu-iotests/115 | 3 +--
> > > tests/qemu-iotests/121 | 6 ++---
> > > tests/qemu-iotests/125 | 2 +-
> > > tests/qemu-iotests/137 | 2 +-
> > > tests/qemu-iotests/138 | 3 +--
> > > tests/qemu-iotests/175 | 2 +-
> > > tests/qemu-iotests/190 | 2 +-
> > > tests/qemu-iotests/191 | 3 +--
> > > tests/qemu-iotests/220 | 4 ++-
> > > tests/qemu-iotests/243 | 6 +++--
> > > tests/qemu-iotests/244 | 10 +++++---
> > > tests/qemu-iotests/250 | 3 +--
> > > tests/qemu-iotests/265 | 2 +-
> > > 22 files changed, 100 insertions(+), 101 deletions(-)
>
> [...]
>
> > > diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
> > > index 325da63a4c..99563bf126 100755
> > > --- a/tests/qemu-iotests/039
> > > +++ b/tests/qemu-iotests/039
> > > @@ -50,8 +50,7 @@ size=128M
> > > echo
> > > echo "== Checking that image is clean on shutdown =="
> > >
> > > -IMGOPTS="compat=1.1,lazy_refcounts=on"
> > > -_make_test_img $size
> > > +_make_test_img -o "compat=1.1,lazy_refcounts=on" $size
> >
> > Any reason for compat=1.1 here? Other that it was before like that.
>
> Lazy refcounts only work with qcow2 v3 (compat=1.1).
Agree, sorry for not noticing this.
Best regards,
Maxim Levitsky
>
> Max
>
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267
2019-09-30 13:01 ` Max Reitz
@ 2019-09-30 14:32 ` Maxim Levitsky
2019-09-30 15:01 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 14:32 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 15:01 +0200, Max Reitz wrote:
> On 29.09.19 18:33, Maxim Levitsky wrote:
> > On Fri, 2019-09-27 at 11:42 +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 <mreitz@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 95f885442f..529f5f9afe 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
> >
> > qemu's master (pulled today), don't have iotest 267,
> > you probably based this on some not yet merged branch.
> > Or I made some mistake with pulling the master branch.
>
> Yep, it’s only in Kevin’s block branch (and thus mine, too). He sent a
> pull request for it, which was rejected though (because this test is
> broken on anything but x64, but that doesn’t stop this patch).
>
I figured out that it must be something like that.
Being lazy, I would like to ask if we have maybe a list of these
branches somewhere in the wiki?
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts
2019-09-30 12:59 ` Max Reitz
@ 2019-09-30 14:47 ` Maxim Levitsky
2019-09-30 14:59 ` Max Reitz
0 siblings, 1 reply; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 14:47 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 14:59 +0200, Max Reitz wrote:
> On 29.09.19 18:31, Maxim Levitsky wrote:
> > On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
> > > Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
> > > globally. That is not how it should be done; instead, they should
> > > simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
> > > default anyway).
> > >
> > > This makes the tests heed user-specified $IMGOPTS. Some do not work
> > > with all image options, though, so we need to disable them accordingly.
> > >
> > > Signed-off-by: Max Reitz <mreitz@redhat.com>
> > > ---
> > > tests/qemu-iotests/036 | 3 +--
> > > tests/qemu-iotests/060 | 4 ++--
> > > tests/qemu-iotests/062 | 3 ++-
> > > tests/qemu-iotests/066 | 3 ++-
> > > tests/qemu-iotests/068 | 3 ++-
> > > tests/qemu-iotests/098 | 3 +--
> > > 6 files changed, 10 insertions(+), 9 deletions(-)
> > >
> > > diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> > > index 69d0f9f903..57dda23b02 100755
> > > --- a/tests/qemu-iotests/036
> > > +++ b/tests/qemu-iotests/036
> > > @@ -43,9 +43,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> > > # This tests qcow2-specific low-level functionality
> > > _supported_fmt qcow2
> > > _supported_proto file
> > > -
> > > # Only qcow2v3 and later supports feature bits
> > > -IMGOPTS="compat=1.1"
> > > +_unsupported_imgopts 'compat=0.10'
> > >
> > > echo
> > > echo === Image with unknown incompatible feature bit ===
> > > diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
> > > index b91d8321bb..9c2ef42522 100755
> > > --- a/tests/qemu-iotests/060
> > > +++ b/tests/qemu-iotests/060
> > > @@ -48,6 +48,8 @@ _filter_io_error()
> > > _supported_fmt qcow2
> > > _supported_proto file
> > > _supported_os Linux
> > > +# These tests only work for compat=1.1 images with refcount_bits=16
> > > +_unsupported_imgopts 'compat=0.10' 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
> > >
> > > rt_offset=65536 # 0x10000 (XXX: just an assumption)
> > > rb_offset=131072 # 0x20000 (XXX: just an assumption)
> > > @@ -55,8 +57,6 @@ l1_offset=196608 # 0x30000 (XXX: just an assumption)
> > > l2_offset=262144 # 0x40000 (XXX: just an assumption)
> > > l2_offset_after_snapshot=524288 # 0x80000 (XXX: just an assumption)
> > >
> > > -IMGOPTS="compat=1.1"
> > > -
> > > OPEN_RW="open -o overlap-check=all $TEST_IMG"
> > > # Overlap checks are done before write operations only, therefore opening an
> > > # image read-only makes the overlap-check option irrelevant
> > > diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
> > > index d5f818fcce..ac0d2a9a3b 100755
> > > --- a/tests/qemu-iotests/062
> > > +++ b/tests/qemu-iotests/062
> > > @@ -40,8 +40,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> > > # This tests qocw2-specific low-level functionality
> > > _supported_fmt qcow2
> > > _supported_proto generic
> > > +# We need zero clusters and snapshots
> > > +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
> > >
> > > -IMGOPTS="compat=1.1"
> > > IMG_SIZE=64M
> > >
> > > echo
> > > diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
> > > index 28f8c98412..9a15ba8027 100755
> > > --- a/tests/qemu-iotests/066
> > > +++ b/tests/qemu-iotests/066
> > > @@ -39,9 +39,10 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> > > # This tests qocw2-specific low-level functionality
> > > _supported_fmt qcow2
> > > _supported_proto generic
> > > +# Weneed zero clusters and snapshots
> >
> > Typo
>
> Indeed!
>
> > > +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
> > >
> > > # Intentionally create an unaligned image
> > > -IMGOPTS="compat=1.1"
> > > IMG_SIZE=$((64 * 1024 * 1024 + 512))
> > >
> > > echo
> > > diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
> > > index 22f5ca3ba6..65650fca9a 100755
> > > --- a/tests/qemu-iotests/068
> > > +++ b/tests/qemu-iotests/068
> > > @@ -39,8 +39,9 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> > > # This tests qocw2-specific low-level functionality
> > > _supported_fmt qcow2
> > > _supported_proto generic
> > > +# Internal snapshots are (currently) impossible with refcount_bits=1
> >
> > Why currently? 1 bit will only allow to mark a cluser as used/unused which
> > is not enough for any snapshots?
>
> It is, because in theory you can just copy the clusters at the time of
> snapshotting. We’ll never implement it, but, well...
Fair enough, I didn't even thought of that. I fully agree that
implementing this is silly.
>
> > > +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
> > >
> > > -IMGOPTS="compat=1.1"
> > > IMG_SIZE=128K
> > >
> > > case "$QEMU_DEFAULT_MACHINE" in
> > > diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
> > > index 1c1d1c468f..2d68dc7d6c 100755
> > > --- a/tests/qemu-iotests/098
> > > +++ b/tests/qemu-iotests/098
> > > @@ -40,8 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> > >
> > > _supported_fmt qcow2
> > > _supported_proto file
> > > -
> > > -IMGOPTS="compat=1.1"
> > > +_unsupported_imgopts 'compat=0.10'
> >
> > Any idea why? I am not familiar with qcow2 well enought to
> > know but this misses a comment with justification.
>
> Because the special bdrv_make_empty() version we want to test only works
> with qcow2 v3 images.
Just to understand this, we have
compat=0.10, also known as v2, which is the classical qcow2 (and v1 is basically qcow)
and then we have compat=1.1 which is also known as v3, and once upon a time was supposed
to be called qcow3, but at the end remained qcow2.
>
> > >
> > > for event in l1_update empty_image_prepare reftable_update refblock_alloc; do
> > >
> >
> >
> > Best regards,
> > Maxim Levitsky
> >
>
> Thanks for reviewing!
Thanks to you too!
I will focus more on reviewing in next few months,
since I really don't do this enough.
Best regards,
Maxim Levitsky
>
> Max
>
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts
2019-09-30 14:47 ` Maxim Levitsky
@ 2019-09-30 14:59 ` Max Reitz
0 siblings, 0 replies; 60+ messages in thread
From: Max Reitz @ 2019-09-30 14:59 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 2192 bytes --]
On 30.09.19 16:47, Maxim Levitsky wrote:
> On Mon, 2019-09-30 at 14:59 +0200, Max Reitz wrote:
>> On 29.09.19 18:31, Maxim Levitsky wrote:
>>> On Fri, 2019-09-27 at 11:42 +0200, Max Reitz wrote:
>>>> Some tests require compat=1.1 and thus set IMGOPTS='compat=1.1'
>>>> globally. That is not how it should be done; instead, they should
>>>> simply set _unsupported_imgopts to compat=0.10 (compat=1.1 is the
>>>> default anyway).
>>>>
>>>> This makes the tests heed user-specified $IMGOPTS. Some do not work
>>>> with all image options, though, so we need to disable them accordingly.
>>>>
>>>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>>>> ---
>>>> tests/qemu-iotests/036 | 3 +--
>>>> tests/qemu-iotests/060 | 4 ++--
>>>> tests/qemu-iotests/062 | 3 ++-
>>>> tests/qemu-iotests/066 | 3 ++-
>>>> tests/qemu-iotests/068 | 3 ++-
>>>> tests/qemu-iotests/098 | 3 +--
>>>> 6 files changed, 10 insertions(+), 9 deletions(-)
[...]
>>
>>>> +_unsupported_imgopts 'compat=0.10' 'refcount_bits=1[^0-9]'
>>>>
>>>> -IMGOPTS="compat=1.1"
>>>> IMG_SIZE=128K
>>>>
>>>> case "$QEMU_DEFAULT_MACHINE" in
>>>> diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
>>>> index 1c1d1c468f..2d68dc7d6c 100755
>>>> --- a/tests/qemu-iotests/098
>>>> +++ b/tests/qemu-iotests/098
>>>> @@ -40,8 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>>>>
>>>> _supported_fmt qcow2
>>>> _supported_proto file
>>>> -
>>>> -IMGOPTS="compat=1.1"
>>>> +_unsupported_imgopts 'compat=0.10'
>>>
>>> Any idea why? I am not familiar with qcow2 well enought to
>>> know but this misses a comment with justification.
>>
>> Because the special bdrv_make_empty() version we want to test only works
>> with qcow2 v3 images.
> Just to understand this, we have
>
> compat=0.10, also known as v2, which is the classical qcow2 (and v1 is basically qcow)
> and then we have compat=1.1 which is also known as v3, and once upon a time was supposed
> to be called qcow3, but at the end remained qcow2.
Yep, that’s correct. If you want to, you can still call it qcow3. I
wanted to do that at some point, but it turned out that nobody else does it.
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267
2019-09-30 14:32 ` Maxim Levitsky
@ 2019-09-30 15:01 ` Max Reitz
2019-09-30 15:06 ` Maxim Levitsky
0 siblings, 1 reply; 60+ messages in thread
From: Max Reitz @ 2019-09-30 15:01 UTC (permalink / raw)
To: Maxim Levitsky, qemu-block; +Cc: Kevin Wolf, qemu-devel
[-- Attachment #1.1: Type: text/plain, Size: 2967 bytes --]
On 30.09.19 16:32, Maxim Levitsky wrote:
> On Mon, 2019-09-30 at 15:01 +0200, Max Reitz wrote:
>> On 29.09.19 18:33, Maxim Levitsky wrote:
>>> On Fri, 2019-09-27 at 11:42 +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 <mreitz@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 95f885442f..529f5f9afe 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
>>>
>>> qemu's master (pulled today), don't have iotest 267,
>>> you probably based this on some not yet merged branch.
>>> Or I made some mistake with pulling the master branch.
>>
>> Yep, it’s only in Kevin’s block branch (and thus mine, too). He sent a
>> pull request for it, which was rejected though (because this test is
>> broken on anything but x64, but that doesn’t stop this patch).
>>
>
> I figured out that it must be something like that.
> Being lazy, I would like to ask if we have maybe a list of these
> branches somewhere in the wiki?
The MAINTAINERS file has at least Kevin’s branch:
$ scripts/get_maintainer.pl --scm --no-email --no-l -f block
git https://repo.or.cz/qemu/kevin.git block
Max
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 60+ messages in thread
* Re: [PATCH 09/18] iotests: Drop IMGOPTS use in 267
2019-09-30 15:01 ` Max Reitz
@ 2019-09-30 15:06 ` Maxim Levitsky
0 siblings, 0 replies; 60+ messages in thread
From: Maxim Levitsky @ 2019-09-30 15:06 UTC (permalink / raw)
To: Max Reitz, qemu-block; +Cc: Kevin Wolf, qemu-devel
On Mon, 2019-09-30 at 17:01 +0200, Max Reitz wrote:
> On 30.09.19 16:32, Maxim Levitsky wrote:
> > On Mon, 2019-09-30 at 15:01 +0200, Max Reitz wrote:
> > > On 29.09.19 18:33, Maxim Levitsky wrote:
> > > > On Fri, 2019-09-27 at 11:42 +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 <mreitz@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 95f885442f..529f5f9afe 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
> > > >
> > > > qemu's master (pulled today), don't have iotest 267,
> > > > you probably based this on some not yet merged branch.
> > > > Or I made some mistake with pulling the master branch.
> > >
> > > Yep, it’s only in Kevin’s block branch (and thus mine, too). He sent a
> > > pull request for it, which was rejected though (because this test is
> > > broken on anything but x64, but that doesn’t stop this patch).
> > >
> >
> > I figured out that it must be something like that.
> > Being lazy, I would like to ask if we have maybe a list of these
> > branches somewhere in the wiki?
>
> The MAINTAINERS file has at least Kevin’s branch:
>
> $ scripts/get_maintainer.pl --scm --no-email --no-l -f block
> git https://repo.or.cz/qemu/kevin.git block
Thank you!
I didn't knew that MAINTAINERS contain git branches these day.
Best regards,
Maxim Levitsky
^ permalink raw reply [flat|nested] 60+ messages in thread
end of thread, other threads:[~2019-09-30 15:10 UTC | newest]
Thread overview: 60+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-27 9:42 [PATCH 00/18] iotests: Allow ./check -o data_file Max Reitz
2019-09-27 9:42 ` [PATCH 01/18] iotests: Filter refcount_order in 036 Max Reitz
2019-09-29 16:31 ` Maxim Levitsky
2019-09-30 12:43 ` Max Reitz
2019-09-30 13:40 ` Maxim Levitsky
2019-09-30 13:44 ` Max Reitz
2019-09-30 13:58 ` Maxim Levitsky
2019-09-30 14:04 ` Max Reitz
2019-09-30 14:14 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 02/18] iotests: Replace IMGOPTS by _unsupported_imgopts Max Reitz
2019-09-29 16:31 ` Maxim Levitsky
2019-09-30 12:59 ` Max Reitz
2019-09-30 14:47 ` Maxim Levitsky
2019-09-30 14:59 ` Max Reitz
2019-09-27 9:42 ` [PATCH 03/18] iotests: Drop compat=1.1 in 050 Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 04/18] iotests: Let _make_test_img parse its parameters Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 05/18] iotests: Add -o and --no-opts to _make_test_img Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 06/18] iotests: Inject space into -ocompat=0.10 in 051 Max Reitz
2019-09-29 16:32 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 07/18] iotests: Replace IMGOPTS= by -o Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-30 13:00 ` Max Reitz
2019-09-30 14:30 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 08/18] iotests: Replace IMGOPTS='' by --no-opts Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 09/18] iotests: Drop IMGOPTS use in 267 Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-30 13:01 ` Max Reitz
2019-09-30 14:32 ` Maxim Levitsky
2019-09-30 15:01 ` Max Reitz
2019-09-30 15:06 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 10/18] iotests: Avoid qemu-img create Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 11/18] iotests: Use _rm_test_img for deleting test images Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 12/18] iotests: Avoid cp/mv of " Max Reitz
2019-09-29 16:33 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 13/18] iotests: Make 091 work with data_file Max Reitz
2019-09-29 16:34 ` Maxim Levitsky
2019-09-30 13:07 ` Max Reitz
2019-09-27 9:42 ` [PATCH 14/18] iotests: Make 110 " Max Reitz
2019-09-29 16:34 ` Maxim Levitsky
2019-09-30 13:34 ` Max Reitz
2019-09-30 13:41 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 15/18] iotests: Make 137 " Max Reitz
2019-09-29 16:38 ` Maxim Levitsky
2019-09-30 13:38 ` Max Reitz
2019-09-30 13:46 ` Maxim Levitsky
2019-09-30 13:57 ` Max Reitz
2019-09-30 14:06 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 16/18] iotests: Make 198 " Max Reitz
2019-09-29 16:38 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 17/18] iotests: Disable data_file where it cannot be used Max Reitz
2019-09-29 16:39 ` Maxim Levitsky
2019-09-27 9:42 ` [PATCH 18/18] iotests: Allow check -o data_file Max Reitz
2019-09-29 16:39 ` Maxim Levitsky
2019-09-30 13:43 ` Max Reitz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.