* [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
People often forget to run the iotests before submitting patches or
pull requests - this is likely due to the fact that we do not run the
tests during our mandatory "make check" tests yet.
This patch series now changes the "auto" group to only include tests
that should be safe to run in all CI environments (including FreeBSD
and macOS!). Thus these iotests can now always be run during "make
check" automatically, too.
v2:
- Use "auto" group instead of adding a new "ci" group
- Adjusted the tests that are run automatically (after doing lots
of CI runs on cirrus-ci.com, gitlab and travis)
- Added patch to fix the current regression with the "qemu-io:"
prefix in the master branch
- Added a fix for iotest 005 on ext4 filesystems (skip it there)
Thomas Huth (8):
tests/qemu-iotests: Fix output of qemu-io related tests
tests/qemu-iotests/005: Add a sanity check for large sparse file
support
tests/qemu-iotests/check: Pick a default machine if necessary
tests/qemu-iotests: Do not hard-code the path to bash
cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
tests/qemu-iotests: Remove the "_supported_os Linux" line from many
tests
tests/qemu-iotests/group: Re-use the "auto" group for tests that can
always run
tests: Run the iotests during "make check" again
.cirrus.yml | 4 +-
.travis.yml | 1 +
tests/Makefile.include | 8 +-
tests/check-block.sh | 44 +++++++---
tests/qemu-iotests-quick.sh | 8 --
tests/qemu-iotests/001 | 1 -
tests/qemu-iotests/002 | 1 -
tests/qemu-iotests/003 | 1 -
tests/qemu-iotests/004 | 1 -
tests/qemu-iotests/005 | 9 ++
tests/qemu-iotests/007 | 1 -
tests/qemu-iotests/008 | 1 -
tests/qemu-iotests/009 | 1 -
tests/qemu-iotests/010 | 1 -
tests/qemu-iotests/011 | 1 -
tests/qemu-iotests/012 | 1 -
tests/qemu-iotests/015 | 1 -
tests/qemu-iotests/017 | 1 -
tests/qemu-iotests/020 | 1 -
tests/qemu-iotests/021 | 1 -
tests/qemu-iotests/022 | 1 -
tests/qemu-iotests/025 | 1 -
tests/qemu-iotests/026 | 1 -
tests/qemu-iotests/026.out | 168 +++++++++++++++++------------------
tests/qemu-iotests/027 | 1 -
tests/qemu-iotests/029 | 1 -
tests/qemu-iotests/031 | 1 -
tests/qemu-iotests/032 | 1 -
tests/qemu-iotests/033 | 1 -
tests/qemu-iotests/035 | 1 -
tests/qemu-iotests/036 | 1 -
tests/qemu-iotests/037 | 1 -
tests/qemu-iotests/042 | 1 -
tests/qemu-iotests/043 | 1 -
tests/qemu-iotests/046 | 1 -
tests/qemu-iotests/047 | 1 -
tests/qemu-iotests/049 | 1 -
tests/qemu-iotests/050 | 1 -
tests/qemu-iotests/051 | 1 -
tests/qemu-iotests/052 | 1 -
tests/qemu-iotests/053 | 1 -
tests/qemu-iotests/054 | 1 -
tests/qemu-iotests/060.out | 6 +-
tests/qemu-iotests/062 | 1 -
tests/qemu-iotests/063 | 1 -
tests/qemu-iotests/066 | 1 -
tests/qemu-iotests/067 | 1 -
tests/qemu-iotests/068 | 1 -
tests/qemu-iotests/069 | 1 -
tests/qemu-iotests/069.out | 2 +-
tests/qemu-iotests/070.out | 2 +-
tests/qemu-iotests/071 | 1 -
tests/qemu-iotests/072 | 1 -
tests/qemu-iotests/073 | 1 -
tests/qemu-iotests/075.out | 14 +--
tests/qemu-iotests/076.out | 6 +-
tests/qemu-iotests/078.out | 12 +--
tests/qemu-iotests/079 | 1 -
tests/qemu-iotests/080.out | 40 ++++-----
tests/qemu-iotests/081.out | 2 +-
tests/qemu-iotests/082 | 1 -
tests/qemu-iotests/085 | 1 -
tests/qemu-iotests/088.out | 12 +--
tests/qemu-iotests/089 | 1 -
tests/qemu-iotests/090 | 1 -
tests/qemu-iotests/094 | 1 -
tests/qemu-iotests/095 | 1 -
tests/qemu-iotests/098 | 1 -
tests/qemu-iotests/102 | 1 -
tests/qemu-iotests/103 | 1 -
tests/qemu-iotests/103.out | 14 +--
tests/qemu-iotests/104 | 1 -
tests/qemu-iotests/105 | 1 -
tests/qemu-iotests/107 | 1 -
tests/qemu-iotests/110 | 1 -
tests/qemu-iotests/111 | 1 -
tests/qemu-iotests/112 | 1 -
tests/qemu-iotests/114 | 1 -
tests/qemu-iotests/114.out | 2 +-
tests/qemu-iotests/115 | 1 -
tests/qemu-iotests/116.out | 14 +--
tests/qemu-iotests/117 | 1 -
tests/qemu-iotests/120 | 1 -
tests/qemu-iotests/125 | 1 -
tests/qemu-iotests/126 | 1 -
tests/qemu-iotests/127 | 1 -
tests/qemu-iotests/131.out | 2 +-
tests/qemu-iotests/133 | 1 -
tests/qemu-iotests/133.out | 30 +++----
tests/qemu-iotests/134 | 1 -
tests/qemu-iotests/137.out | 28 +++---
tests/qemu-iotests/140.out | 2 +-
tests/qemu-iotests/142 | 1 -
tests/qemu-iotests/143 | 1 -
tests/qemu-iotests/143.out | 2 +-
tests/qemu-iotests/144 | 1 -
tests/qemu-iotests/145 | 1 -
tests/qemu-iotests/153 | 1 -
tests/qemu-iotests/153.out | 30 +++----
tests/qemu-iotests/156 | 1 -
tests/qemu-iotests/157 | 1 -
tests/qemu-iotests/158 | 1 -
tests/qemu-iotests/159 | 1 -
tests/qemu-iotests/162 | 1 -
tests/qemu-iotests/170 | 1 -
tests/qemu-iotests/173 | 1 -
tests/qemu-iotests/182 | 1 -
tests/qemu-iotests/183 | 1 -
tests/qemu-iotests/186 | 1 -
tests/qemu-iotests/187 | 1 -
tests/qemu-iotests/187.out | 6 +-
tests/qemu-iotests/188.out | 2 +-
tests/qemu-iotests/190 | 1 -
tests/qemu-iotests/191 | 1 -
tests/qemu-iotests/192 | 1 -
tests/qemu-iotests/195 | 1 -
tests/qemu-iotests/197 | 1 -
tests/qemu-iotests/197.out | 2 +-
tests/qemu-iotests/200 | 1 -
tests/qemu-iotests/205 | 2 +-
tests/qemu-iotests/214 | 1 -
tests/qemu-iotests/215 | 1 -
tests/qemu-iotests/215.out | 2 +-
tests/qemu-iotests/217 | 1 -
tests/qemu-iotests/226.out | 16 ++--
tests/qemu-iotests/227 | 1 -
tests/qemu-iotests/231 | 1 -
tests/qemu-iotests/233 | 1 -
tests/qemu-iotests/239 | 2 +-
tests/qemu-iotests/240 | 3 +-
tests/qemu-iotests/241 | 2 +-
tests/qemu-iotests/243 | 2 +-
tests/qemu-iotests/244 | 2 +-
tests/qemu-iotests/244.out | 10 +--
tests/qemu-iotests/247 | 1 -
tests/qemu-iotests/check | 13 ++-
tests/qemu-iotests/group | 169 +++++++++++++++++++-----------------
137 files changed, 372 insertions(+), 421 deletions(-)
delete mode 100755 tests/qemu-iotests-quick.sh
--
2.21.0
^ permalink raw reply [flat|nested] 62+ messages in thread* [Qemu-devel] [PATCH v2 1/8] tests/qemu-iotests: Fix output of qemu-io related tests
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
One of the recent commits changed the way qemu-io prints out its
errors and warnings - they are now prefixed with the program name.
We've got to adapt the iotests accordingly to prevent that they
are failing.
Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/026.out | 168 ++++++++++++++++++-------------------
tests/qemu-iotests/060.out | 6 +-
tests/qemu-iotests/069.out | 2 +-
tests/qemu-iotests/070.out | 2 +-
tests/qemu-iotests/075.out | 14 ++--
tests/qemu-iotests/076.out | 6 +-
tests/qemu-iotests/078.out | 12 +--
tests/qemu-iotests/080.out | 40 ++++-----
tests/qemu-iotests/081.out | 2 +-
tests/qemu-iotests/088.out | 12 +--
tests/qemu-iotests/103.out | 14 ++--
tests/qemu-iotests/114.out | 2 +-
tests/qemu-iotests/116.out | 14 ++--
tests/qemu-iotests/131.out | 2 +-
tests/qemu-iotests/133.out | 30 +++----
tests/qemu-iotests/137.out | 28 +++----
tests/qemu-iotests/140.out | 2 +-
tests/qemu-iotests/143.out | 2 +-
tests/qemu-iotests/153.out | 30 +++----
tests/qemu-iotests/187.out | 6 +-
tests/qemu-iotests/188.out | 2 +-
tests/qemu-iotests/197.out | 2 +-
tests/qemu-iotests/205 | 2 +-
tests/qemu-iotests/215.out | 2 +-
tests/qemu-iotests/226.out | 16 ++--
tests/qemu-iotests/244.out | 10 +--
26 files changed, 214 insertions(+), 214 deletions(-)
diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out
index dd10a82b51..fb89b8480c 100644
--- a/tests/qemu-iotests/026.out
+++ b/tests/qemu-iotests/026.out
@@ -14,8 +14,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_update; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
1 leaked clusters were found on the image.
@@ -23,8 +23,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_update; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
1 leaked clusters were found on the image.
@@ -42,8 +42,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_update; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
1 leaked clusters were found on the image.
@@ -51,8 +51,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_update; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
1 leaked clusters were found on the image.
@@ -134,8 +134,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_update; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
127 leaked clusters were found on the image.
@@ -143,8 +143,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_update; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
127 leaked clusters were found on the image.
@@ -162,8 +162,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_update; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
127 leaked clusters were found on the image.
@@ -171,8 +171,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_update; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
127 leaked clusters were found on the image.
@@ -190,15 +190,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_alloc_write; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
1 leaked clusters were found on the image.
@@ -216,15 +216,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_alloc_write; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
1 leaked clusters were found on the image.
@@ -242,15 +242,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: write_aio; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: write_aio; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -266,15 +266,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: write_aio; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: write_aio; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -290,15 +290,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_load; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_load; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -314,15 +314,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_load; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_load; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -338,15 +338,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_update_part; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -362,15 +362,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_update_part; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -386,15 +386,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -410,15 +410,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -477,8 +477,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
55 leaked clusters were found on the image.
@@ -486,8 +486,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
251 leaked clusters were found on the image.
@@ -505,15 +505,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -529,8 +529,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
10 leaked clusters were found on the image.
@@ -538,8 +538,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
23 leaked clusters were found on the image.
@@ -557,8 +557,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
10 leaked clusters were found on the image.
@@ -566,8 +566,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
23 leaked clusters were found on the image.
@@ -585,8 +585,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
10 leaked clusters were found on the image.
@@ -594,8 +594,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
23 leaked clusters were found on the image.
@@ -631,8 +631,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_grow_write_table; errno: 5; imm: off; once: off
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -643,8 +643,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_grow_write_table; errno: 28; imm: off; once: off
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -655,8 +655,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_grow_activate_table; errno: 5; imm: off; once: off
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
96 leaked clusters were found on the image.
@@ -669,8 +669,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_grow_activate_table; errno: 28; imm: off; once: off
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
96 leaked clusters were found on the image.
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
index af623cfd86..ad1c18e903 100644
--- a/tests/qemu-iotests/060.out
+++ b/tests/qemu-iotests/060.out
@@ -20,7 +20,7 @@ Format specific information:
lazy refcounts: false
refcount bits: 16
corrupt: true
-can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
+qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
no file open, try 'help open'
read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -267,7 +267,7 @@ No errors were found on the image.
=== Testing zero refcount table size ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
ERROR cluster 0 refcount=0 reference=1
ERROR cluster 3 refcount=0 reference=1
Rebuilding refcount structure
@@ -296,7 +296,7 @@ Can't get refcount for cluster 2: Input/output error
Can't get refcount for cluster 3: Input/output error
Rebuilding refcount structure
Repairing cluster 1 refcount=1 reference=0
-can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
--- Repairing ---
Leaked cluster 1 refcount=1 reference=0
Repairing cluster 1 refcount=1 reference=0
diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out
index f97585677b..c78e8c2b72 100644
--- a/tests/qemu-iotests/069.out
+++ b/tests/qemu-iotests/069.out
@@ -4,5 +4,5 @@ QA output created by 069
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
-can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
*** done
diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
index c269d99483..c7c567344c 100644
--- a/tests/qemu-iotests/070.out
+++ b/tests/qemu-iotests/070.out
@@ -1,7 +1,7 @@
QA output created by 070
=== Verify open image read-only fails, due to dirty log ===
-can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
+qemu-io: can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
To replay the log, run:
qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'
=== Verify open image replays log ===
diff --git a/tests/qemu-iotests/075.out b/tests/qemu-iotests/075.out
index b234b758e0..4f3871d337 100644
--- a/tests/qemu-iotests/075.out
+++ b/tests/qemu-iotests/075.out
@@ -9,23 +9,23 @@ read 512/512 bytes at offset 1048064
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== block_size must be a multiple of 512 ==
-can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
== block_size cannot be zero ==
-can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
== huge block_size ===
-can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
== offsets_size overflow ===
-can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
== refuse images that require too many offsets ===
-can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
== refuse images with non-monotonically increasing offsets ==
-can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
== refuse images with invalid compressed block size ==
-can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
*** done
diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out
index 9c66c5fb46..2de8a710a5 100644
--- a/tests/qemu-iotests/076.out
+++ b/tests/qemu-iotests/076.out
@@ -5,13 +5,13 @@ read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== Negative catalog size ==
-can't open device TEST_DIR/parallels-v1: Catalog too large
+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
== Overflow in catalog allocation ==
-can't open device TEST_DIR/parallels-v1: Catalog too large
+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
== Zero sectors per track ==
-can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
+qemu-io: can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
== Read from a valid v2 image ==
read 65536/65536 bytes at offset 0
diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out
index c3d6aa4fe4..4a82e1779f 100644
--- a/tests/qemu-iotests/078.out
+++ b/tests/qemu-iotests/078.out
@@ -5,18 +5,18 @@ read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== Negative catalog size ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
== Overflow for catalog size * sizeof(uint32_t) ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
== Too small catalog bitmap for image size ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
-can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
== Negative extent size ==
-can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
== Zero extent size ==
-can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
*** done
diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out
index 281c7e0d1d..45ab01db8e 100644
--- a/tests/qemu-iotests/080.out
+++ b/tests/qemu-iotests/080.out
@@ -2,34 +2,34 @@ QA output created by 080
== Huge header size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
-can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
== Huge unknown header extension ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Invalid backing file offset
-can't open device TEST_DIR/t.qcow2: Header extension too large
-can't open device TEST_DIR/t.qcow2: Header extension too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset
+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
== Huge refcount table size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table too large
-can't open device TEST_DIR/t.qcow2: Reference count table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
== Misaligned refcount table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
== Huge refcount offset ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
== Invalid snapshot table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Snapshot table too large
-can't open device TEST_DIR/t.qcow2: Snapshot table too large
-can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
-can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
== Hitting snapshot table size limit ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -39,10 +39,10 @@ read 512/512 bytes at offset 0
== Invalid L1 table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Active L1 table too large
-can't open device TEST_DIR/t.qcow2: Active L1 table too large
-can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
-can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
== Invalid L1 table (with internal snapshot in the image) ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -50,7 +50,7 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small
== Invalid backing file size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Backing file name too long
+qemu-io: can't open device TEST_DIR/t.qcow2: Backing file name too long
== Invalid L2 entry (huge physical offset) ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -66,7 +66,7 @@ wrote 512/512 bytes at offset 0
qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid
qemu-img: Snapshot L1 table offset invalid
qemu-img: Failed to turn zero into data clusters: Invalid argument
-Failed to flush the refcount block cache: Invalid argument
+qemu-io: Failed to flush the refcount block cache: Invalid argument
write failed: Invalid argument
qemu-img: Snapshot L1 table offset invalid
qemu-img: Could not apply snapshot 'test': Failed to load snapshot: Invalid argument
@@ -89,7 +89,7 @@ wrote 512/512 bytes at offset 0
qemu-img: Failed to load snapshot: Snapshot L1 table too large
qemu-img: Snapshot L1 table too large
qemu-img: Failed to turn zero into data clusters: File too large
-Failed to flush the refcount block cache: File too large
+qemu-io: Failed to flush the refcount block cache: File too large
write failed: File too large
qemu-img: Snapshot L1 table too large
qemu-img: Could not apply snapshot 'test': Failed to load snapshot: File too large
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
index 8ec1783ffe..04091b64e5 100644
--- a/tests/qemu-iotests/081.out
+++ b/tests/qemu-iotests/081.out
@@ -70,7 +70,7 @@ read 10485760/10485760 bytes at offset 0
10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== checking the blkverify mode with invalid settings ==
-can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
+qemu-io: can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
== dynamically adding a child to a quorum ==
Testing:
diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out
index 1f6bcf0abc..814be7181d 100644
--- a/tests/qemu-iotests/088.out
+++ b/tests/qemu-iotests/088.out
@@ -2,10 +2,10 @@ QA output created by 088
== Invalid block size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.vpc: Invalid block size 0
-can't open device TEST_DIR/t.vpc: Invalid block size 0
-can't open device TEST_DIR/t.vpc: Invalid block size 128
-can't open device TEST_DIR/t.vpc: Invalid block size 128
-can't open device TEST_DIR/t.vpc: Invalid block size 305419896
-can't open device TEST_DIR/t.vpc: Invalid block size 305419896
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
*** done
diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out
index bd9eec3250..16704cf499 100644
--- a/tests/qemu-iotests/103.out
+++ b/tests/qemu-iotests/103.out
@@ -5,13 +5,13 @@ wrote 65536/65536 bytes at offset 0
=== Testing invalid option combinations ===
-can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
-can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
-can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
+qemu-io: can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
=== Testing valid option combinations ===
diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
index 1a47a526b9..22dc66c633 100644
--- a/tests/qemu-iotests/114.out
+++ b/tests/qemu-iotests/114.out
@@ -7,7 +7,7 @@ virtual size: 64M (67108864 bytes)
cluster_size: 65536
backing file: TEST_DIR/t.IMGFMT.base
backing file format: foo
-can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
no file open, try 'help open'
read 4096/4096 bytes at offset 0
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
diff --git a/tests/qemu-iotests/116.out b/tests/qemu-iotests/116.out
index 24bee57783..49f9a261a0 100644
--- a/tests/qemu-iotests/116.out
+++ b/tests/qemu-iotests/116.out
@@ -2,29 +2,29 @@ QA output created by 116
== truncated header cluster ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid header magic ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Image not in QED format
+qemu-io: can't open device TEST_DIR/t.qed: Image not in QED format
== invalid cluster size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid table size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid header size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid L1 table offset ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid image size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
*** done
diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out
index 27c2c5389b..70da03dee5 100644
--- a/tests/qemu-iotests/131.out
+++ b/tests/qemu-iotests/131.out
@@ -22,7 +22,7 @@ read 32768/32768 bytes at offset 163840
read 32768/32768 bytes at offset 0
32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== Corrupt image ==
-can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
+qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
ERROR image was not closed correctly
1 errors were found on the image.
diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
index 414c7fa27f..1491ef45a9 100644
--- a/tests/qemu-iotests/133.out
+++ b/tests/qemu-iotests/133.out
@@ -4,18 +4,18 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t
=== Check that node-name can't be changed ===
-Cannot change the option 'node-name'
-Cannot change the option 'node-name'
-Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
=== Check that unchanged node-name is okay ===
=== Check that driver can't be changed ===
-Cannot change the option 'driver'
-Cannot change the option 'driver'
-Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
=== Check that unchanged driver is okay ===
@@ -27,16 +27,16 @@ format name: null-co
=== Check that mixing -c/-r/-w and their corresponding options is forbidden ===
-Cannot set both -r/-w and 'read-only'
-Cannot set both -r/-w and 'read-only'
-Cannot set both -c and the cache options
-Cannot set both -c and the cache options
-Cannot set both -c and the cache options
+qemu-io: Cannot set both -r/-w and 'read-only'
+qemu-io: Cannot set both -r/-w and 'read-only'
+qemu-io: Cannot set both -c and the cache options
+qemu-io: Cannot set both -c and the cache options
+qemu-io: Cannot set both -c and the cache options
=== Check that invalid options are handled correctly ===
-Parameter 'read-only' expects 'on' or 'off'
-Parameter 'cache.no-flush' expects 'on' or 'off'
-Parameter 'cache.direct' expects 'on' or 'off'
-Parameter 'auto-read-only' expects 'on' or 'off'
+qemu-io: Parameter 'read-only' expects 'on' or 'off'
+qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off'
+qemu-io: Parameter 'cache.direct' expects 'on' or 'off'
+qemu-io: Parameter 'auto-read-only' expects 'on' or 'off'
*** done
diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
index 2c080b72f3..22d59df40c 100644
--- a/tests/qemu-iotests/137.out
+++ b/tests/qemu-iotests/137.out
@@ -15,24 +15,24 @@ read 33554432/33554432 bytes at offset 0
=== Try setting some invalid values ===
-Parameter 'lazy-refcounts' expects 'on' or 'off'
-cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-l2-cache-size may not exceed cache-size
-refcount-cache-size may not exceed cache-size
-L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-Refcount cache size too big
-Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-Cache clean interval too big
+qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
+qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: l2-cache-size may not exceed cache-size
+qemu-io: refcount-cache-size may not exceed cache-size
+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: Refcount cache size too big
+qemu-io: Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Cache clean interval too big
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
-L2 cache size too big
+qemu-io: L2 cache size too big
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
=== Test transaction semantics ===
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
./common.rc: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then
@@ -44,7 +44,7 @@ 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)
-Parameter 'lazy-refcounts' expects 'on' or 'off'
+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
write failed: Input/output error
*** done
diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
index 704adcef40..67fe44a3e3 100644
--- a/tests/qemu-iotests/140.out
+++ b/tests/qemu-iotests/140.out
@@ -8,7 +8,7 @@ wrote 65536/65536 bytes at offset 0
read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
{"return": {}}
-can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
+qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
server reported: export 'drv' not present
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out
index 3e55fcd0ac..ee71b5aa42 100644
--- a/tests/qemu-iotests/143.out
+++ b/tests/qemu-iotests/143.out
@@ -1,7 +1,7 @@
QA output created by 143
{"return": {}}
{"return": {}}
-can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
+qemu-io: can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
server reported: export 'no_such_export' not present
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
index 9747ce3c41..021c1cb899 100644
--- a/tests/qemu-iotests/153.out
+++ b/tests/qemu-iotests/153.out
@@ -23,20 +23,20 @@ Is another process using the image [TEST_DIR/t.qcow2]?
== Running utility commands ==
_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
no file open, try 'help open'
_qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
no file open, try 'help open'
@@ -100,12 +100,12 @@ file format: IMGFMT
== Running utility commands -U ==
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
no file open, try 'help open'
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -166,13 +166,13 @@ Is another process using the image [TEST_DIR/t.qcow2]?
== Running utility commands ==
_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
no file open, try 'help open'
@@ -222,12 +222,12 @@ file format: IMGFMT
== Running utility commands -U ==
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
no file open, try 'help open'
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -325,12 +325,12 @@ file format: IMGFMT
== Running utility commands -U ==
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
no file open, try 'help open'
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -420,7 +420,7 @@ Adding drive
{"return": "OKrn"}
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
Creating overlay with qemu-img when the guest is running should be allowed
@@ -437,7 +437,7 @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
{"return": ""}
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
Closing the other
{"return": ""}
@@ -458,5 +458,5 @@ qemu-img: --force-share/-U conflicts with image options
No conflict:
Conflict:
--U conflicts with image options
+qemu-io: -U conflicts with image options
*** done
diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out
index 30b987f71f..86203d8abc 100644
--- a/tests/qemu-iotests/187.out
+++ b/tests/qemu-iotests/187.out
@@ -3,16 +3,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Start from read-only
-Block node is read-only
+qemu-io: Block node is read-only
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Block node is read-only
+qemu-io: Block node is read-only
Start from read-write
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Block node is read-only
+qemu-io: Block node is read-only
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
*** done
diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out
index 8af24e5d8b..97b1402671 100644
--- a/tests/qemu-iotests/188.out
+++ b/tests/qemu-iotests/188.out
@@ -14,5 +14,5 @@ read 16777216/16777216 bytes at offset 0
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== verify open failure with wrong password ==
-can't open: Invalid password, cannot unlock any keyslot
+qemu-io: can't open: Invalid password, cannot unlock any keyslot
*** done
diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
index 8febda5dea..7ca46be6e4 100644
--- a/tests/qemu-iotests/197.out
+++ b/tests/qemu-iotests/197.out
@@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024
2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
read 1024/1024 bytes at offset 3221226496
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
index 31b2f5707a..69f2c1d392 100755
--- a/tests/qemu-iotests/205
+++ b/tests/qemu-iotests/205
@@ -78,7 +78,7 @@ class TestNbdServerRemove(iotests.QMPTestCase):
def assertConnectFailed(self, qemu_io_output):
self.assertEqual(filter_qemu_io(qemu_io_output).strip(),
- "can't open device " + nbd_uri +
+ "qemu-io: can't open device " + nbd_uri +
": Requested export not available\n"
"server reported: export 'exp' not present")
diff --git a/tests/qemu-iotests/215.out b/tests/qemu-iotests/215.out
index 70b0f5fb19..5a2fe40d03 100644
--- a/tests/qemu-iotests/215.out
+++ b/tests/qemu-iotests/215.out
@@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024
2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
read 1024/1024 bytes at offset 3221226496
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out
index 8c0d060ffc..42be973ff2 100644
--- a/tests/qemu-iotests/226.out
+++ b/tests/qemu-iotests/226.out
@@ -3,24 +3,24 @@ QA output created by 226
=== Testing with driver:file ===
== Testing RO ==
-can't open: A regular file was expected by the 'file' driver, but something else was given
-warning: Opening a character device as a file using the 'file' driver is deprecated
+qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given
+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
== Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
-warning: Opening a character device as a file using the 'file' driver is deprecated
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
=== Testing with driver:host_device ===
== Testing RO ==
-can't open: 'host_device' driver expects either a character or block device
+qemu-io: can't open: 'host_device' driver expects either a character or block device
== Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
=== Testing with driver:host_cdrom ===
== Testing RO ==
-can't open: 'host_cdrom' driver expects either a character or block device
+qemu-io: can't open: 'host_cdrom' driver expects either a character or block device
== Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
*** done
diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out
index 98e5946976..6a3d0067cc 100644
--- a/tests/qemu-iotests/244.out
+++ b/tests/qemu-iotests/244.out
@@ -9,22 +9,22 @@ read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
no file open, try 'help open'
Data file required, but without data file name in the image:
-can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
no file open, try 'help open'
read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
no file open, try 'help open'
Setting data-file for an image with internal data:
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
no file open, try 'help open'
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
no file open, try 'help open'
=== Conflicting features ===
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* [Qemu-devel] [PATCH v2 1/8] tests/qemu-iotests: Fix output of qemu-io related tests
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
One of the recent commits changed the way qemu-io prints out its
errors and warnings - they are now prefixed with the program name.
We've got to adapt the iotests accordingly to prevent that they
are failing.
Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/026.out | 168 ++++++++++++++++++-------------------
tests/qemu-iotests/060.out | 6 +-
tests/qemu-iotests/069.out | 2 +-
tests/qemu-iotests/070.out | 2 +-
tests/qemu-iotests/075.out | 14 ++--
tests/qemu-iotests/076.out | 6 +-
tests/qemu-iotests/078.out | 12 +--
tests/qemu-iotests/080.out | 40 ++++-----
tests/qemu-iotests/081.out | 2 +-
tests/qemu-iotests/088.out | 12 +--
tests/qemu-iotests/103.out | 14 ++--
tests/qemu-iotests/114.out | 2 +-
tests/qemu-iotests/116.out | 14 ++--
tests/qemu-iotests/131.out | 2 +-
tests/qemu-iotests/133.out | 30 +++----
tests/qemu-iotests/137.out | 28 +++----
tests/qemu-iotests/140.out | 2 +-
tests/qemu-iotests/143.out | 2 +-
tests/qemu-iotests/153.out | 30 +++----
tests/qemu-iotests/187.out | 6 +-
tests/qemu-iotests/188.out | 2 +-
tests/qemu-iotests/197.out | 2 +-
tests/qemu-iotests/205 | 2 +-
tests/qemu-iotests/215.out | 2 +-
tests/qemu-iotests/226.out | 16 ++--
tests/qemu-iotests/244.out | 10 +--
26 files changed, 214 insertions(+), 214 deletions(-)
diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out
index dd10a82b51..fb89b8480c 100644
--- a/tests/qemu-iotests/026.out
+++ b/tests/qemu-iotests/026.out
@@ -14,8 +14,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_update; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
1 leaked clusters were found on the image.
@@ -23,8 +23,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_update; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
1 leaked clusters were found on the image.
@@ -42,8 +42,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_update; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
1 leaked clusters were found on the image.
@@ -51,8 +51,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_update; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
1 leaked clusters were found on the image.
@@ -134,8 +134,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_update; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
127 leaked clusters were found on the image.
@@ -143,8 +143,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_update; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
127 leaked clusters were found on the image.
@@ -162,8 +162,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_update; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
127 leaked clusters were found on the image.
@@ -171,8 +171,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_update; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
127 leaked clusters were found on the image.
@@ -190,15 +190,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_alloc_write; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
1 leaked clusters were found on the image.
@@ -216,15 +216,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_alloc_write; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
1 leaked clusters were found on the image.
@@ -242,15 +242,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: write_aio; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: write_aio; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -266,15 +266,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: write_aio; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: write_aio; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -290,15 +290,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_load; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_load; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -314,15 +314,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_load; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_load; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -338,15 +338,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_update_part; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -362,15 +362,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_update_part; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -386,15 +386,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc; errno: 5; imm: off; once: off; write
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -410,15 +410,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -477,8 +477,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
55 leaked clusters were found on the image.
@@ -486,8 +486,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
251 leaked clusters were found on the image.
@@ -505,15 +505,15 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -529,8 +529,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
10 leaked clusters were found on the image.
@@ -538,8 +538,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
23 leaked clusters were found on the image.
@@ -557,8 +557,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
10 leaked clusters were found on the image.
@@ -566,8 +566,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
23 leaked clusters were found on the image.
@@ -585,8 +585,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
10 leaked clusters were found on the image.
@@ -594,8 +594,8 @@ This means waste of disk space, but no harm to data.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
23 leaked clusters were found on the image.
@@ -631,8 +631,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_grow_write_table; errno: 5; imm: off; once: off
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -643,8 +643,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_grow_write_table; errno: 28; imm: off; once: off
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
@@ -655,8 +655,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_grow_activate_table; errno: 5; imm: off; once: off
-Failed to flush the L2 table cache: Input/output error
-Failed to flush the refcount block cache: Input/output error
+qemu-io: Failed to flush the L2 table cache: Input/output error
+qemu-io: Failed to flush the refcount block cache: Input/output error
write failed: Input/output error
96 leaked clusters were found on the image.
@@ -669,8 +669,8 @@ No errors were found on the image.
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
Event: l1_grow_activate_table; errno: 28; imm: off; once: off
-Failed to flush the L2 table cache: No space left on device
-Failed to flush the refcount block cache: No space left on device
+qemu-io: Failed to flush the L2 table cache: No space left on device
+qemu-io: Failed to flush the refcount block cache: No space left on device
write failed: No space left on device
96 leaked clusters were found on the image.
diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
index af623cfd86..ad1c18e903 100644
--- a/tests/qemu-iotests/060.out
+++ b/tests/qemu-iotests/060.out
@@ -20,7 +20,7 @@ Format specific information:
lazy refcounts: false
refcount bits: 16
corrupt: true
-can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
+qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
no file open, try 'help open'
read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
@@ -267,7 +267,7 @@ No errors were found on the image.
=== Testing zero refcount table size ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
ERROR cluster 0 refcount=0 reference=1
ERROR cluster 3 refcount=0 reference=1
Rebuilding refcount structure
@@ -296,7 +296,7 @@ Can't get refcount for cluster 2: Input/output error
Can't get refcount for cluster 3: Input/output error
Rebuilding refcount structure
Repairing cluster 1 refcount=1 reference=0
-can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
--- Repairing ---
Leaked cluster 1 refcount=1 reference=0
Repairing cluster 1 refcount=1 reference=0
diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out
index f97585677b..c78e8c2b72 100644
--- a/tests/qemu-iotests/069.out
+++ b/tests/qemu-iotests/069.out
@@ -4,5 +4,5 @@ QA output created by 069
Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
-can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
+qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
*** done
diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
index c269d99483..c7c567344c 100644
--- a/tests/qemu-iotests/070.out
+++ b/tests/qemu-iotests/070.out
@@ -1,7 +1,7 @@
QA output created by 070
=== Verify open image read-only fails, due to dirty log ===
-can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
+qemu-io: can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
To replay the log, run:
qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'
=== Verify open image replays log ===
diff --git a/tests/qemu-iotests/075.out b/tests/qemu-iotests/075.out
index b234b758e0..4f3871d337 100644
--- a/tests/qemu-iotests/075.out
+++ b/tests/qemu-iotests/075.out
@@ -9,23 +9,23 @@ read 512/512 bytes at offset 1048064
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== block_size must be a multiple of 512 ==
-can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
== block_size cannot be zero ==
-can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
== huge block_size ===
-can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
== offsets_size overflow ===
-can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
== refuse images that require too many offsets ===
-can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
== refuse images with non-monotonically increasing offsets ==
-can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
== refuse images with invalid compressed block size ==
-can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
+qemu-io: can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
*** done
diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out
index 9c66c5fb46..2de8a710a5 100644
--- a/tests/qemu-iotests/076.out
+++ b/tests/qemu-iotests/076.out
@@ -5,13 +5,13 @@ read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== Negative catalog size ==
-can't open device TEST_DIR/parallels-v1: Catalog too large
+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
== Overflow in catalog allocation ==
-can't open device TEST_DIR/parallels-v1: Catalog too large
+qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
== Zero sectors per track ==
-can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
+qemu-io: can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
== Read from a valid v2 image ==
read 65536/65536 bytes at offset 0
diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out
index c3d6aa4fe4..4a82e1779f 100644
--- a/tests/qemu-iotests/078.out
+++ b/tests/qemu-iotests/078.out
@@ -5,18 +5,18 @@ read 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== Negative catalog size ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
== Overflow for catalog size * sizeof(uint32_t) ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
== Too small catalog bitmap for image size ==
-can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
-can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
+qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
== Negative extent size ==
-can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
== Zero extent size ==
-can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
+qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
*** done
diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out
index 281c7e0d1d..45ab01db8e 100644
--- a/tests/qemu-iotests/080.out
+++ b/tests/qemu-iotests/080.out
@@ -2,34 +2,34 @@ QA output created by 080
== Huge header size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
-can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
+qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
== Huge unknown header extension ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Invalid backing file offset
-can't open device TEST_DIR/t.qcow2: Header extension too large
-can't open device TEST_DIR/t.qcow2: Header extension too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset
+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
== Huge refcount table size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table too large
-can't open device TEST_DIR/t.qcow2: Reference count table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
== Misaligned refcount table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
== Huge refcount offset ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
== Invalid snapshot table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Snapshot table too large
-can't open device TEST_DIR/t.qcow2: Snapshot table too large
-can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
-can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
== Hitting snapshot table size limit ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -39,10 +39,10 @@ read 512/512 bytes at offset 0
== Invalid L1 table ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Active L1 table too large
-can't open device TEST_DIR/t.qcow2: Active L1 table too large
-can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
-can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
+qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
== Invalid L1 table (with internal snapshot in the image) ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -50,7 +50,7 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small
== Invalid backing file size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: Backing file name too long
+qemu-io: can't open device TEST_DIR/t.qcow2: Backing file name too long
== Invalid L2 entry (huge physical offset) ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
@@ -66,7 +66,7 @@ wrote 512/512 bytes at offset 0
qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid
qemu-img: Snapshot L1 table offset invalid
qemu-img: Failed to turn zero into data clusters: Invalid argument
-Failed to flush the refcount block cache: Invalid argument
+qemu-io: Failed to flush the refcount block cache: Invalid argument
write failed: Invalid argument
qemu-img: Snapshot L1 table offset invalid
qemu-img: Could not apply snapshot 'test': Failed to load snapshot: Invalid argument
@@ -89,7 +89,7 @@ wrote 512/512 bytes at offset 0
qemu-img: Failed to load snapshot: Snapshot L1 table too large
qemu-img: Snapshot L1 table too large
qemu-img: Failed to turn zero into data clusters: File too large
-Failed to flush the refcount block cache: File too large
+qemu-io: Failed to flush the refcount block cache: File too large
write failed: File too large
qemu-img: Snapshot L1 table too large
qemu-img: Could not apply snapshot 'test': Failed to load snapshot: File too large
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
index 8ec1783ffe..04091b64e5 100644
--- a/tests/qemu-iotests/081.out
+++ b/tests/qemu-iotests/081.out
@@ -70,7 +70,7 @@ read 10485760/10485760 bytes at offset 0
10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== checking the blkverify mode with invalid settings ==
-can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
+qemu-io: can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
== dynamically adding a child to a quorum ==
Testing:
diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out
index 1f6bcf0abc..814be7181d 100644
--- a/tests/qemu-iotests/088.out
+++ b/tests/qemu-iotests/088.out
@@ -2,10 +2,10 @@ QA output created by 088
== Invalid block size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.vpc: Invalid block size 0
-can't open device TEST_DIR/t.vpc: Invalid block size 0
-can't open device TEST_DIR/t.vpc: Invalid block size 128
-can't open device TEST_DIR/t.vpc: Invalid block size 128
-can't open device TEST_DIR/t.vpc: Invalid block size 305419896
-can't open device TEST_DIR/t.vpc: Invalid block size 305419896
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
+qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
*** done
diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out
index bd9eec3250..16704cf499 100644
--- a/tests/qemu-iotests/103.out
+++ b/tests/qemu-iotests/103.out
@@ -5,13 +5,13 @@ wrote 65536/65536 bytes at offset 0
=== Testing invalid option combinations ===
-can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
-can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
-can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
+qemu-io: can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
+qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
=== Testing valid option combinations ===
diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
index 1a47a526b9..22dc66c633 100644
--- a/tests/qemu-iotests/114.out
+++ b/tests/qemu-iotests/114.out
@@ -7,7 +7,7 @@ virtual size: 64M (67108864 bytes)
cluster_size: 65536
backing file: TEST_DIR/t.IMGFMT.base
backing file format: foo
-can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
no file open, try 'help open'
read 4096/4096 bytes at offset 0
4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
diff --git a/tests/qemu-iotests/116.out b/tests/qemu-iotests/116.out
index 24bee57783..49f9a261a0 100644
--- a/tests/qemu-iotests/116.out
+++ b/tests/qemu-iotests/116.out
@@ -2,29 +2,29 @@ QA output created by 116
== truncated header cluster ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid header magic ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Image not in QED format
+qemu-io: can't open device TEST_DIR/t.qed: Image not in QED format
== invalid cluster size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid table size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid header size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid L1 table offset ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
== invalid image size ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
+qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
*** done
diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out
index 27c2c5389b..70da03dee5 100644
--- a/tests/qemu-iotests/131.out
+++ b/tests/qemu-iotests/131.out
@@ -22,7 +22,7 @@ read 32768/32768 bytes at offset 163840
read 32768/32768 bytes at offset 0
32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== Corrupt image ==
-can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
+qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
ERROR image was not closed correctly
1 errors were found on the image.
diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
index 414c7fa27f..1491ef45a9 100644
--- a/tests/qemu-iotests/133.out
+++ b/tests/qemu-iotests/133.out
@@ -4,18 +4,18 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t
=== Check that node-name can't be changed ===
-Cannot change the option 'node-name'
-Cannot change the option 'node-name'
-Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
+qemu-io: Cannot change the option 'node-name'
=== Check that unchanged node-name is okay ===
=== Check that driver can't be changed ===
-Cannot change the option 'driver'
-Cannot change the option 'driver'
-Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
+qemu-io: Cannot change the option 'driver'
=== Check that unchanged driver is okay ===
@@ -27,16 +27,16 @@ format name: null-co
=== Check that mixing -c/-r/-w and their corresponding options is forbidden ===
-Cannot set both -r/-w and 'read-only'
-Cannot set both -r/-w and 'read-only'
-Cannot set both -c and the cache options
-Cannot set both -c and the cache options
-Cannot set both -c and the cache options
+qemu-io: Cannot set both -r/-w and 'read-only'
+qemu-io: Cannot set both -r/-w and 'read-only'
+qemu-io: Cannot set both -c and the cache options
+qemu-io: Cannot set both -c and the cache options
+qemu-io: Cannot set both -c and the cache options
=== Check that invalid options are handled correctly ===
-Parameter 'read-only' expects 'on' or 'off'
-Parameter 'cache.no-flush' expects 'on' or 'off'
-Parameter 'cache.direct' expects 'on' or 'off'
-Parameter 'auto-read-only' expects 'on' or 'off'
+qemu-io: Parameter 'read-only' expects 'on' or 'off'
+qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off'
+qemu-io: Parameter 'cache.direct' expects 'on' or 'off'
+qemu-io: Parameter 'auto-read-only' expects 'on' or 'off'
*** done
diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
index 2c080b72f3..22d59df40c 100644
--- a/tests/qemu-iotests/137.out
+++ b/tests/qemu-iotests/137.out
@@ -15,24 +15,24 @@ read 33554432/33554432 bytes at offset 0
=== Try setting some invalid values ===
-Parameter 'lazy-refcounts' expects 'on' or 'off'
-cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
-l2-cache-size may not exceed cache-size
-refcount-cache-size may not exceed cache-size
-L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-L2 cache entry size must be a power of two between 512 and the cluster size (65536)
-Refcount cache size too big
-Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
-Cache clean interval too big
+qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
+qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
+qemu-io: l2-cache-size may not exceed cache-size
+qemu-io: refcount-cache-size may not exceed cache-size
+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
+qemu-io: Refcount cache size too big
+qemu-io: Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Cache clean interval too big
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
-L2 cache size too big
+qemu-io: L2 cache size too big
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
=== Test transaction semantics ===
-Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
+qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
wrote 512/512 bytes at offset 0
512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
./common.rc: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then
@@ -44,7 +44,7 @@ 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)
-Parameter 'lazy-refcounts' expects 'on' or 'off'
+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
write failed: Input/output error
*** done
diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
index 704adcef40..67fe44a3e3 100644
--- a/tests/qemu-iotests/140.out
+++ b/tests/qemu-iotests/140.out
@@ -8,7 +8,7 @@ wrote 65536/65536 bytes at offset 0
read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
{"return": {}}
-can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
+qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
server reported: export 'drv' not present
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out
index 3e55fcd0ac..ee71b5aa42 100644
--- a/tests/qemu-iotests/143.out
+++ b/tests/qemu-iotests/143.out
@@ -1,7 +1,7 @@
QA output created by 143
{"return": {}}
{"return": {}}
-can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
+qemu-io: can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
server reported: export 'no_such_export' not present
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
index 9747ce3c41..021c1cb899 100644
--- a/tests/qemu-iotests/153.out
+++ b/tests/qemu-iotests/153.out
@@ -23,20 +23,20 @@ Is another process using the image [TEST_DIR/t.qcow2]?
== Running utility commands ==
_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
no file open, try 'help open'
_qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
no file open, try 'help open'
@@ -100,12 +100,12 @@ file format: IMGFMT
== Running utility commands -U ==
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
no file open, try 'help open'
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -166,13 +166,13 @@ Is another process using the image [TEST_DIR/t.qcow2]?
== Running utility commands ==
_qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
_qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
_qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
no file open, try 'help open'
@@ -222,12 +222,12 @@ file format: IMGFMT
== Running utility commands -U ==
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
no file open, try 'help open'
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -325,12 +325,12 @@ file format: IMGFMT
== Running utility commands -U ==
_qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
_qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
_qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
-can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
+qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
no file open, try 'help open'
_qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
@@ -420,7 +420,7 @@ Adding drive
{"return": "OKrn"}
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
Creating overlay with qemu-img when the guest is running should be allowed
@@ -437,7 +437,7 @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
{"return": ""}
_qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
-can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
+qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
Is another process using the image [TEST_DIR/t.qcow2]?
Closing the other
{"return": ""}
@@ -458,5 +458,5 @@ qemu-img: --force-share/-U conflicts with image options
No conflict:
Conflict:
--U conflicts with image options
+qemu-io: -U conflicts with image options
*** done
diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out
index 30b987f71f..86203d8abc 100644
--- a/tests/qemu-iotests/187.out
+++ b/tests/qemu-iotests/187.out
@@ -3,16 +3,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
Start from read-only
-Block node is read-only
+qemu-io: Block node is read-only
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Block node is read-only
+qemu-io: Block node is read-only
Start from read-write
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-Block node is read-only
+qemu-io: Block node is read-only
wrote 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
*** done
diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out
index 8af24e5d8b..97b1402671 100644
--- a/tests/qemu-iotests/188.out
+++ b/tests/qemu-iotests/188.out
@@ -14,5 +14,5 @@ read 16777216/16777216 bytes at offset 0
16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
== verify open failure with wrong password ==
-can't open: Invalid password, cannot unlock any keyslot
+qemu-io: can't open: Invalid password, cannot unlock any keyslot
*** done
diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
index 8febda5dea..7ca46be6e4 100644
--- a/tests/qemu-iotests/197.out
+++ b/tests/qemu-iotests/197.out
@@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024
2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
read 1024/1024 bytes at offset 3221226496
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
index 31b2f5707a..69f2c1d392 100755
--- a/tests/qemu-iotests/205
+++ b/tests/qemu-iotests/205
@@ -78,7 +78,7 @@ class TestNbdServerRemove(iotests.QMPTestCase):
def assertConnectFailed(self, qemu_io_output):
self.assertEqual(filter_qemu_io(qemu_io_output).strip(),
- "can't open device " + nbd_uri +
+ "qemu-io: can't open device " + nbd_uri +
": Requested export not available\n"
"server reported: export 'exp' not present")
diff --git a/tests/qemu-iotests/215.out b/tests/qemu-iotests/215.out
index 70b0f5fb19..5a2fe40d03 100644
--- a/tests/qemu-iotests/215.out
+++ b/tests/qemu-iotests/215.out
@@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024
2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
read 1024/1024 bytes at offset 3221226496
1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
+qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out
index 8c0d060ffc..42be973ff2 100644
--- a/tests/qemu-iotests/226.out
+++ b/tests/qemu-iotests/226.out
@@ -3,24 +3,24 @@ QA output created by 226
=== Testing with driver:file ===
== Testing RO ==
-can't open: A regular file was expected by the 'file' driver, but something else was given
-warning: Opening a character device as a file using the 'file' driver is deprecated
+qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given
+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
== Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
-warning: Opening a character device as a file using the 'file' driver is deprecated
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
=== Testing with driver:host_device ===
== Testing RO ==
-can't open: 'host_device' driver expects either a character or block device
+qemu-io: can't open: 'host_device' driver expects either a character or block device
== Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
=== Testing with driver:host_cdrom ===
== Testing RO ==
-can't open: 'host_cdrom' driver expects either a character or block device
+qemu-io: can't open: 'host_cdrom' driver expects either a character or block device
== Testing RW ==
-can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
+qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
*** done
diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out
index 98e5946976..6a3d0067cc 100644
--- a/tests/qemu-iotests/244.out
+++ b/tests/qemu-iotests/244.out
@@ -9,22 +9,22 @@ read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
no file open, try 'help open'
Data file required, but without data file name in the image:
-can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
no file open, try 'help open'
read 65536/65536 bytes at offset 0
64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
no file open, try 'help open'
Setting data-file for an image with internal data:
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
-can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
+qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
no file open, try 'help open'
-can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
+qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
no file open, try 'help open'
=== Conflicting features ===
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/8] tests/qemu-iotests: Fix output of qemu-io related tests
@ 2019-05-01 10:24 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 10:24 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> One of the recent commits changed the way qemu-io prints out its
> errors and warnings - they are now prefixed with the program name.
> We've got to adapt the iotests accordingly to prevent that they
> are failing.
>
> Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/qemu-iotests/026.out | 168 ++++++++++++++++++-------------------
> tests/qemu-iotests/060.out | 6 +-
> tests/qemu-iotests/069.out | 2 +-
> tests/qemu-iotests/070.out | 2 +-
> tests/qemu-iotests/075.out | 14 ++--
> tests/qemu-iotests/076.out | 6 +-
> tests/qemu-iotests/078.out | 12 +--
> tests/qemu-iotests/080.out | 40 ++++-----
> tests/qemu-iotests/081.out | 2 +-
> tests/qemu-iotests/088.out | 12 +--
> tests/qemu-iotests/103.out | 14 ++--
> tests/qemu-iotests/114.out | 2 +-
> tests/qemu-iotests/116.out | 14 ++--
> tests/qemu-iotests/131.out | 2 +-
> tests/qemu-iotests/133.out | 30 +++----
> tests/qemu-iotests/137.out | 28 +++----
> tests/qemu-iotests/140.out | 2 +-
> tests/qemu-iotests/143.out | 2 +-
> tests/qemu-iotests/153.out | 30 +++----
> tests/qemu-iotests/187.out | 6 +-
> tests/qemu-iotests/188.out | 2 +-
> tests/qemu-iotests/197.out | 2 +-
> tests/qemu-iotests/205 | 2 +-
> tests/qemu-iotests/215.out | 2 +-
> tests/qemu-iotests/226.out | 16 ++--
> tests/qemu-iotests/244.out | 10 +--
> 26 files changed, 214 insertions(+), 214 deletions(-)
>
> diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out
> index dd10a82b51..fb89b8480c 100644
> --- a/tests/qemu-iotests/026.out
> +++ b/tests/qemu-iotests/026.out
> @@ -14,8 +14,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_update; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 1 leaked clusters were found on the image.
> @@ -23,8 +23,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_update; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 1 leaked clusters were found on the image.
> @@ -42,8 +42,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_update; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 1 leaked clusters were found on the image.
> @@ -51,8 +51,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_update; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 1 leaked clusters were found on the image.
> @@ -134,8 +134,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_update; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 127 leaked clusters were found on the image.
> @@ -143,8 +143,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_update; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 127 leaked clusters were found on the image.
> @@ -162,8 +162,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_update; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 127 leaked clusters were found on the image.
> @@ -171,8 +171,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_update; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 127 leaked clusters were found on the image.
> @@ -190,15 +190,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_alloc_write; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 1 leaked clusters were found on the image.
> @@ -216,15 +216,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_alloc_write; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 1 leaked clusters were found on the image.
> @@ -242,15 +242,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: write_aio; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: write_aio; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -266,15 +266,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: write_aio; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: write_aio; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -290,15 +290,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_load; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_load; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -314,15 +314,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_load; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_load; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -338,15 +338,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_update_part; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -362,15 +362,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_update_part; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -386,15 +386,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -410,15 +410,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -477,8 +477,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 55 leaked clusters were found on the image.
> @@ -486,8 +486,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 251 leaked clusters were found on the image.
> @@ -505,15 +505,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -529,8 +529,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 10 leaked clusters were found on the image.
> @@ -538,8 +538,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 23 leaked clusters were found on the image.
> @@ -557,8 +557,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 10 leaked clusters were found on the image.
> @@ -566,8 +566,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 23 leaked clusters were found on the image.
> @@ -585,8 +585,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 10 leaked clusters were found on the image.
> @@ -594,8 +594,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 23 leaked clusters were found on the image.
> @@ -631,8 +631,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_grow_write_table; errno: 5; imm: off; once: off
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -643,8 +643,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_grow_write_table; errno: 28; imm: off; once: off
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -655,8 +655,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_grow_activate_table; errno: 5; imm: off; once: off
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 96 leaked clusters were found on the image.
> @@ -669,8 +669,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_grow_activate_table; errno: 28; imm: off; once: off
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 96 leaked clusters were found on the image.
> diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
> index af623cfd86..ad1c18e903 100644
> --- a/tests/qemu-iotests/060.out
> +++ b/tests/qemu-iotests/060.out
> @@ -20,7 +20,7 @@ Format specific information:
> lazy refcounts: false
> refcount bits: 16
> corrupt: true
> -can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
> no file open, try 'help open'
> read 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> @@ -267,7 +267,7 @@ No errors were found on the image.
> === Testing zero refcount table size ===
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
> ERROR cluster 0 refcount=0 reference=1
> ERROR cluster 3 refcount=0 reference=1
> Rebuilding refcount structure
> @@ -296,7 +296,7 @@ Can't get refcount for cluster 2: Input/output error
> Can't get refcount for cluster 3: Input/output error
> Rebuilding refcount structure
> Repairing cluster 1 refcount=1 reference=0
> -can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
> --- Repairing ---
> Leaked cluster 1 refcount=1 reference=0
> Repairing cluster 1 refcount=1 reference=0
> diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out
> index f97585677b..c78e8c2b72 100644
> --- a/tests/qemu-iotests/069.out
> +++ b/tests/qemu-iotests/069.out
> @@ -4,5 +4,5 @@ QA output created by 069
>
> Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
> -can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
> *** done
> diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
> index c269d99483..c7c567344c 100644
> --- a/tests/qemu-iotests/070.out
> +++ b/tests/qemu-iotests/070.out
> @@ -1,7 +1,7 @@
> QA output created by 070
>
> === Verify open image read-only fails, due to dirty log ===
> -can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
> +qemu-io: can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
> To replay the log, run:
> qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'
> === Verify open image replays log ===
> diff --git a/tests/qemu-iotests/075.out b/tests/qemu-iotests/075.out
> index b234b758e0..4f3871d337 100644
> --- a/tests/qemu-iotests/075.out
> +++ b/tests/qemu-iotests/075.out
> @@ -9,23 +9,23 @@ read 512/512 bytes at offset 1048064
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == block_size must be a multiple of 512 ==
> -can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
>
> == block_size cannot be zero ==
> -can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
>
> == huge block_size ===
> -can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
>
> == offsets_size overflow ===
> -can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
>
> == refuse images that require too many offsets ===
> -can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
>
> == refuse images with non-monotonically increasing offsets ==
> -can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
>
> == refuse images with invalid compressed block size ==
> -can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
> *** done
> diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out
> index 9c66c5fb46..2de8a710a5 100644
> --- a/tests/qemu-iotests/076.out
> +++ b/tests/qemu-iotests/076.out
> @@ -5,13 +5,13 @@ read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == Negative catalog size ==
> -can't open device TEST_DIR/parallels-v1: Catalog too large
> +qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
>
> == Overflow in catalog allocation ==
> -can't open device TEST_DIR/parallels-v1: Catalog too large
> +qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
>
> == Zero sectors per track ==
> -can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
> +qemu-io: can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
>
> == Read from a valid v2 image ==
> read 65536/65536 bytes at offset 0
> diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out
> index c3d6aa4fe4..4a82e1779f 100644
> --- a/tests/qemu-iotests/078.out
> +++ b/tests/qemu-iotests/078.out
> @@ -5,18 +5,18 @@ read 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == Negative catalog size ==
> -can't open device TEST_DIR/empty.bochs: Catalog size is too large
> +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
>
> == Overflow for catalog size * sizeof(uint32_t) ==
> -can't open device TEST_DIR/empty.bochs: Catalog size is too large
> +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
>
> == Too small catalog bitmap for image size ==
> -can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
> -can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
> +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
> +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
>
> == Negative extent size ==
> -can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
> +qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
>
> == Zero extent size ==
> -can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
> +qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
> *** done
> diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out
> index 281c7e0d1d..45ab01db8e 100644
> --- a/tests/qemu-iotests/080.out
> +++ b/tests/qemu-iotests/080.out
> @@ -2,34 +2,34 @@ QA output created by 080
>
> == Huge header size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
> -can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
> +qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
> +qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
>
> == Huge unknown header extension ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Invalid backing file offset
> -can't open device TEST_DIR/t.qcow2: Header extension too large
> -can't open device TEST_DIR/t.qcow2: Header extension too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset
> +qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
>
> == Huge refcount table size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Reference count table too large
> -can't open device TEST_DIR/t.qcow2: Reference count table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
>
> == Misaligned refcount table ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
>
> == Huge refcount offset ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
>
> == Invalid snapshot table ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Snapshot table too large
> -can't open device TEST_DIR/t.qcow2: Snapshot table too large
> -can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
> -can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
>
> == Hitting snapshot table size limit ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> @@ -39,10 +39,10 @@ read 512/512 bytes at offset 0
>
> == Invalid L1 table ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Active L1 table too large
> -can't open device TEST_DIR/t.qcow2: Active L1 table too large
> -can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
> -can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
>
> == Invalid L1 table (with internal snapshot in the image) ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> @@ -50,7 +50,7 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small
>
> == Invalid backing file size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Backing file name too long
> +qemu-io: can't open device TEST_DIR/t.qcow2: Backing file name too long
>
> == Invalid L2 entry (huge physical offset) ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> @@ -66,7 +66,7 @@ wrote 512/512 bytes at offset 0
> qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid
> qemu-img: Snapshot L1 table offset invalid
> qemu-img: Failed to turn zero into data clusters: Invalid argument
> -Failed to flush the refcount block cache: Invalid argument
> +qemu-io: Failed to flush the refcount block cache: Invalid argument
> write failed: Invalid argument
> qemu-img: Snapshot L1 table offset invalid
> qemu-img: Could not apply snapshot 'test': Failed to load snapshot: Invalid argument
> @@ -89,7 +89,7 @@ wrote 512/512 bytes at offset 0
> qemu-img: Failed to load snapshot: Snapshot L1 table too large
> qemu-img: Snapshot L1 table too large
> qemu-img: Failed to turn zero into data clusters: File too large
> -Failed to flush the refcount block cache: File too large
> +qemu-io: Failed to flush the refcount block cache: File too large
> write failed: File too large
> qemu-img: Snapshot L1 table too large
> qemu-img: Could not apply snapshot 'test': Failed to load snapshot: File too large
> diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
> index 8ec1783ffe..04091b64e5 100644
> --- a/tests/qemu-iotests/081.out
> +++ b/tests/qemu-iotests/081.out
> @@ -70,7 +70,7 @@ read 10485760/10485760 bytes at offset 0
> 10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == checking the blkverify mode with invalid settings ==
> -can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
> +qemu-io: can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
>
> == dynamically adding a child to a quorum ==
> Testing:
> diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out
> index 1f6bcf0abc..814be7181d 100644
> --- a/tests/qemu-iotests/088.out
> +++ b/tests/qemu-iotests/088.out
> @@ -2,10 +2,10 @@ QA output created by 088
>
> == Invalid block size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.vpc: Invalid block size 0
> -can't open device TEST_DIR/t.vpc: Invalid block size 0
> -can't open device TEST_DIR/t.vpc: Invalid block size 128
> -can't open device TEST_DIR/t.vpc: Invalid block size 128
> -can't open device TEST_DIR/t.vpc: Invalid block size 305419896
> -can't open device TEST_DIR/t.vpc: Invalid block size 305419896
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
> *** done
> diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out
> index bd9eec3250..16704cf499 100644
> --- a/tests/qemu-iotests/103.out
> +++ b/tests/qemu-iotests/103.out
> @@ -5,13 +5,13 @@ wrote 65536/65536 bytes at offset 0
>
> === Testing invalid option combinations ===
>
> -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> -can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
> -can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
> -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> -can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> -can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> -can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
>
> === Testing valid option combinations ===
>
> diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
> index 1a47a526b9..22dc66c633 100644
> --- a/tests/qemu-iotests/114.out
> +++ b/tests/qemu-iotests/114.out
> @@ -7,7 +7,7 @@ virtual size: 64M (67108864 bytes)
> cluster_size: 65536
> backing file: TEST_DIR/t.IMGFMT.base
> backing file format: foo
> -can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
> +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
> no file open, try 'help open'
> read 4096/4096 bytes at offset 0
> 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> diff --git a/tests/qemu-iotests/116.out b/tests/qemu-iotests/116.out
> index 24bee57783..49f9a261a0 100644
> --- a/tests/qemu-iotests/116.out
> +++ b/tests/qemu-iotests/116.out
> @@ -2,29 +2,29 @@ QA output created by 116
>
> == truncated header cluster ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid header magic ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Image not in QED format
> +qemu-io: can't open device TEST_DIR/t.qed: Image not in QED format
>
> == invalid cluster size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid table size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid header size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid L1 table offset ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid image size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> *** done
> diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out
> index 27c2c5389b..70da03dee5 100644
> --- a/tests/qemu-iotests/131.out
> +++ b/tests/qemu-iotests/131.out
> @@ -22,7 +22,7 @@ read 32768/32768 bytes at offset 163840
> read 32768/32768 bytes at offset 0
> 32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> == Corrupt image ==
> -can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
> +qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
> ERROR image was not closed correctly
>
> 1 errors were found on the image.
> diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
> index 414c7fa27f..1491ef45a9 100644
> --- a/tests/qemu-iotests/133.out
> +++ b/tests/qemu-iotests/133.out
> @@ -4,18 +4,18 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t
>
> === Check that node-name can't be changed ===
>
> -Cannot change the option 'node-name'
> -Cannot change the option 'node-name'
> -Cannot change the option 'node-name'
> +qemu-io: Cannot change the option 'node-name'
> +qemu-io: Cannot change the option 'node-name'
> +qemu-io: Cannot change the option 'node-name'
>
> === Check that unchanged node-name is okay ===
>
>
> === Check that driver can't be changed ===
>
> -Cannot change the option 'driver'
> -Cannot change the option 'driver'
> -Cannot change the option 'driver'
> +qemu-io: Cannot change the option 'driver'
> +qemu-io: Cannot change the option 'driver'
> +qemu-io: Cannot change the option 'driver'
>
> === Check that unchanged driver is okay ===
>
> @@ -27,16 +27,16 @@ format name: null-co
>
> === Check that mixing -c/-r/-w and their corresponding options is forbidden ===
>
> -Cannot set both -r/-w and 'read-only'
> -Cannot set both -r/-w and 'read-only'
> -Cannot set both -c and the cache options
> -Cannot set both -c and the cache options
> -Cannot set both -c and the cache options
> +qemu-io: Cannot set both -r/-w and 'read-only'
> +qemu-io: Cannot set both -r/-w and 'read-only'
> +qemu-io: Cannot set both -c and the cache options
> +qemu-io: Cannot set both -c and the cache options
> +qemu-io: Cannot set both -c and the cache options
>
> === Check that invalid options are handled correctly ===
>
> -Parameter 'read-only' expects 'on' or 'off'
> -Parameter 'cache.no-flush' expects 'on' or 'off'
> -Parameter 'cache.direct' expects 'on' or 'off'
> -Parameter 'auto-read-only' expects 'on' or 'off'
> +qemu-io: Parameter 'read-only' expects 'on' or 'off'
> +qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off'
> +qemu-io: Parameter 'cache.direct' expects 'on' or 'off'
> +qemu-io: Parameter 'auto-read-only' expects 'on' or 'off'
> *** done
> diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
> index 2c080b72f3..22d59df40c 100644
> --- a/tests/qemu-iotests/137.out
> +++ b/tests/qemu-iotests/137.out
> @@ -15,24 +15,24 @@ read 33554432/33554432 bytes at offset 0
>
> === Try setting some invalid values ===
>
> -Parameter 'lazy-refcounts' expects 'on' or 'off'
> -cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> -l2-cache-size may not exceed cache-size
> -refcount-cache-size may not exceed cache-size
> -L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> -L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> -Refcount cache size too big
> -Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
> -Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> -Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> -Cache clean interval too big
> +qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
> +qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> +qemu-io: l2-cache-size may not exceed cache-size
> +qemu-io: refcount-cache-size may not exceed cache-size
> +qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: Refcount cache size too big
> +qemu-io: Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
> +qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> +qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> +qemu-io: Cache clean interval too big
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
> -L2 cache size too big
> +qemu-io: L2 cache size too big
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>
> === Test transaction semantics ===
>
> -Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> +qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> ./common.rc: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then
> @@ -44,7 +44,7 @@ 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)
> -Parameter 'lazy-refcounts' expects 'on' or 'off'
> +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
> write failed: Input/output error
> *** done
> diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
> index 704adcef40..67fe44a3e3 100644
> --- a/tests/qemu-iotests/140.out
> +++ b/tests/qemu-iotests/140.out
> @@ -8,7 +8,7 @@ wrote 65536/65536 bytes at offset 0
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> -can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
> +qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
> server reported: export 'drv' not present
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
> diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out
> index 3e55fcd0ac..ee71b5aa42 100644
> --- a/tests/qemu-iotests/143.out
> +++ b/tests/qemu-iotests/143.out
> @@ -1,7 +1,7 @@
> QA output created by 143
> {"return": {}}
> {"return": {}}
> -can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
> +qemu-io: can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
> server reported: export 'no_such_export' not present
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
> diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
> index 9747ce3c41..021c1cb899 100644
> --- a/tests/qemu-iotests/153.out
> +++ b/tests/qemu-iotests/153.out
> @@ -23,20 +23,20 @@ Is another process using the image [TEST_DIR/t.qcow2]?
> == Running utility commands ==
>
> _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
>
> _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
>
> _qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> no file open, try 'help open'
>
> _qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> no file open, try 'help open'
>
> @@ -100,12 +100,12 @@ file format: IMGFMT
> == Running utility commands -U ==
>
> _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
>
> _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
>
> _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> no file open, try 'help open'
>
> _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
> @@ -166,13 +166,13 @@ Is another process using the image [TEST_DIR/t.qcow2]?
> == Running utility commands ==
>
> _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
>
> _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
>
> _qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> no file open, try 'help open'
>
> @@ -222,12 +222,12 @@ file format: IMGFMT
> == Running utility commands -U ==
>
> _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
>
> _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
>
> _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> no file open, try 'help open'
>
> _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
> @@ -325,12 +325,12 @@ file format: IMGFMT
> == Running utility commands -U ==
>
> _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
>
> _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
>
> _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> no file open, try 'help open'
>
> _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
> @@ -420,7 +420,7 @@ Adding drive
> {"return": "OKrn"}
>
> _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> Creating overlay with qemu-img when the guest is running should be allowed
>
> @@ -437,7 +437,7 @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
> {"return": ""}
>
> _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> Closing the other
> {"return": ""}
> @@ -458,5 +458,5 @@ qemu-img: --force-share/-U conflicts with image options
> No conflict:
>
> Conflict:
> --U conflicts with image options
> +qemu-io: -U conflicts with image options
> *** done
> diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out
> index 30b987f71f..86203d8abc 100644
> --- a/tests/qemu-iotests/187.out
> +++ b/tests/qemu-iotests/187.out
> @@ -3,16 +3,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>
> Start from read-only
>
> -Block node is read-only
> +qemu-io: Block node is read-only
> wrote 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -Block node is read-only
> +qemu-io: Block node is read-only
>
> Start from read-write
>
> wrote 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -Block node is read-only
> +qemu-io: Block node is read-only
> wrote 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> *** done
> diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out
> index 8af24e5d8b..97b1402671 100644
> --- a/tests/qemu-iotests/188.out
> +++ b/tests/qemu-iotests/188.out
> @@ -14,5 +14,5 @@ read 16777216/16777216 bytes at offset 0
> 16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == verify open failure with wrong password ==
> -can't open: Invalid password, cannot unlock any keyslot
> +qemu-io: can't open: Invalid password, cannot unlock any keyslot
> *** done
> diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
> index 8febda5dea..7ca46be6e4 100644
> --- a/tests/qemu-iotests/197.out
> +++ b/tests/qemu-iotests/197.out
> @@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024
> 2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> read 1024/1024 bytes at offset 3221226496
> 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
> +qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
> 2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
> 1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
> 64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
> diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
> index 31b2f5707a..69f2c1d392 100755
> --- a/tests/qemu-iotests/205
> +++ b/tests/qemu-iotests/205
> @@ -78,7 +78,7 @@ class TestNbdServerRemove(iotests.QMPTestCase):
>
> def assertConnectFailed(self, qemu_io_output):
> self.assertEqual(filter_qemu_io(qemu_io_output).strip(),
> - "can't open device " + nbd_uri +
> + "qemu-io: can't open device " + nbd_uri +
> ": Requested export not available\n"
> "server reported: export 'exp' not present")
>
> diff --git a/tests/qemu-iotests/215.out b/tests/qemu-iotests/215.out
> index 70b0f5fb19..5a2fe40d03 100644
> --- a/tests/qemu-iotests/215.out
> +++ b/tests/qemu-iotests/215.out
> @@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024
> 2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> read 1024/1024 bytes at offset 3221226496
> 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
> +qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
> 2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
> 1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
> 64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
> diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out
> index 8c0d060ffc..42be973ff2 100644
> --- a/tests/qemu-iotests/226.out
> +++ b/tests/qemu-iotests/226.out
> @@ -3,24 +3,24 @@ QA output created by 226
> === Testing with driver:file ===
>
> == Testing RO ==
> -can't open: A regular file was expected by the 'file' driver, but something else was given
> -warning: Opening a character device as a file using the 'file' driver is deprecated
> +qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given
> +qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
> == Testing RW ==
> -can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> -warning: Opening a character device as a file using the 'file' driver is deprecated
> +qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> +qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
>
> === Testing with driver:host_device ===
>
> == Testing RO ==
> -can't open: 'host_device' driver expects either a character or block device
> +qemu-io: can't open: 'host_device' driver expects either a character or block device
> == Testing RW ==
> -can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> +qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
>
> === Testing with driver:host_cdrom ===
>
> == Testing RO ==
> -can't open: 'host_cdrom' driver expects either a character or block device
> +qemu-io: can't open: 'host_cdrom' driver expects either a character or block device
> == Testing RW ==
> -can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> +qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
>
> *** done
> diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out
> index 98e5946976..6a3d0067cc 100644
> --- a/tests/qemu-iotests/244.out
> +++ b/tests/qemu-iotests/244.out
> @@ -9,22 +9,22 @@ read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> no file open, try 'help open'
>
> Data file required, but without data file name in the image:
> -can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
> +qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
> no file open, try 'help open'
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> no file open, try 'help open'
>
> Setting data-file for an image with internal data:
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
> +qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
> no file open, try 'help open'
> -can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> no file open, try 'help open'
>
> === Conflicting features ===
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/8] tests/qemu-iotests: Fix output of qemu-io related tests
@ 2019-05-01 10:24 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 10:24 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> One of the recent commits changed the way qemu-io prints out its
> errors and warnings - they are now prefixed with the program name.
> We've got to adapt the iotests accordingly to prevent that they
> are failing.
>
> Fixes: 99e98d7c9fc1a1639fad ("qemu-io: Use error_[gs]et_progname()")
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/qemu-iotests/026.out | 168 ++++++++++++++++++-------------------
> tests/qemu-iotests/060.out | 6 +-
> tests/qemu-iotests/069.out | 2 +-
> tests/qemu-iotests/070.out | 2 +-
> tests/qemu-iotests/075.out | 14 ++--
> tests/qemu-iotests/076.out | 6 +-
> tests/qemu-iotests/078.out | 12 +--
> tests/qemu-iotests/080.out | 40 ++++-----
> tests/qemu-iotests/081.out | 2 +-
> tests/qemu-iotests/088.out | 12 +--
> tests/qemu-iotests/103.out | 14 ++--
> tests/qemu-iotests/114.out | 2 +-
> tests/qemu-iotests/116.out | 14 ++--
> tests/qemu-iotests/131.out | 2 +-
> tests/qemu-iotests/133.out | 30 +++----
> tests/qemu-iotests/137.out | 28 +++----
> tests/qemu-iotests/140.out | 2 +-
> tests/qemu-iotests/143.out | 2 +-
> tests/qemu-iotests/153.out | 30 +++----
> tests/qemu-iotests/187.out | 6 +-
> tests/qemu-iotests/188.out | 2 +-
> tests/qemu-iotests/197.out | 2 +-
> tests/qemu-iotests/205 | 2 +-
> tests/qemu-iotests/215.out | 2 +-
> tests/qemu-iotests/226.out | 16 ++--
> tests/qemu-iotests/244.out | 10 +--
> 26 files changed, 214 insertions(+), 214 deletions(-)
>
> diff --git a/tests/qemu-iotests/026.out b/tests/qemu-iotests/026.out
> index dd10a82b51..fb89b8480c 100644
> --- a/tests/qemu-iotests/026.out
> +++ b/tests/qemu-iotests/026.out
> @@ -14,8 +14,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_update; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 1 leaked clusters were found on the image.
> @@ -23,8 +23,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_update; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 1 leaked clusters were found on the image.
> @@ -42,8 +42,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_update; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 1 leaked clusters were found on the image.
> @@ -51,8 +51,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_update; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 1 leaked clusters were found on the image.
> @@ -134,8 +134,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_update; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 127 leaked clusters were found on the image.
> @@ -143,8 +143,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_update; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 127 leaked clusters were found on the image.
> @@ -162,8 +162,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_update; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 127 leaked clusters were found on the image.
> @@ -171,8 +171,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_update; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 127 leaked clusters were found on the image.
> @@ -190,15 +190,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_alloc_write; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_alloc_write; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 1 leaked clusters were found on the image.
> @@ -216,15 +216,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_alloc_write; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l2_alloc_write; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 1 leaked clusters were found on the image.
> @@ -242,15 +242,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: write_aio; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: write_aio; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -266,15 +266,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: write_aio; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: write_aio; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -290,15 +290,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_load; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_load; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -314,15 +314,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_load; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_load; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -338,15 +338,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_update_part; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_update_part; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -362,15 +362,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_update_part; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_update_part; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -386,15 +386,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc; errno: 5; imm: off; once: off; write
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc; errno: 5; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -410,15 +410,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -477,8 +477,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 55 leaked clusters were found on the image.
> @@ -486,8 +486,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_hookup; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 251 leaked clusters were found on the image.
> @@ -505,15 +505,15 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -529,8 +529,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 10 leaked clusters were found on the image.
> @@ -538,8 +538,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write_blocks; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 23 leaked clusters were found on the image.
> @@ -557,8 +557,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 10 leaked clusters were found on the image.
> @@ -566,8 +566,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_write_table; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 23 leaked clusters were found on the image.
> @@ -585,8 +585,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 10 leaked clusters were found on the image.
> @@ -594,8 +594,8 @@ This means waste of disk space, but no harm to data.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: refblock_alloc_switch_table; errno: 28; imm: off; once: off; write -b
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 23 leaked clusters were found on the image.
> @@ -631,8 +631,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_grow_write_table; errno: 5; imm: off; once: off
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -643,8 +643,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_grow_write_table; errno: 28; imm: off; once: off
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
> No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
> @@ -655,8 +655,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_grow_activate_table; errno: 5; imm: off; once: off
> -Failed to flush the L2 table cache: Input/output error
> -Failed to flush the refcount block cache: Input/output error
> +qemu-io: Failed to flush the L2 table cache: Input/output error
> +qemu-io: Failed to flush the refcount block cache: Input/output error
> write failed: Input/output error
>
> 96 leaked clusters were found on the image.
> @@ -669,8 +669,8 @@ No errors were found on the image.
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1073741824
>
> Event: l1_grow_activate_table; errno: 28; imm: off; once: off
> -Failed to flush the L2 table cache: No space left on device
> -Failed to flush the refcount block cache: No space left on device
> +qemu-io: Failed to flush the L2 table cache: No space left on device
> +qemu-io: Failed to flush the refcount block cache: No space left on device
> write failed: No space left on device
>
> 96 leaked clusters were found on the image.
> diff --git a/tests/qemu-iotests/060.out b/tests/qemu-iotests/060.out
> index af623cfd86..ad1c18e903 100644
> --- a/tests/qemu-iotests/060.out
> +++ b/tests/qemu-iotests/060.out
> @@ -20,7 +20,7 @@ Format specific information:
> lazy refcounts: false
> refcount bits: 16
> corrupt: true
> -can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: IMGFMT: Image is corrupt; cannot be opened read/write
> no file open, try 'help open'
> read 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> @@ -267,7 +267,7 @@ No errors were found on the image.
> === Testing zero refcount table size ===
>
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Image does not contain a reference count table
> ERROR cluster 0 refcount=0 reference=1
> ERROR cluster 3 refcount=0 reference=1
> Rebuilding refcount structure
> @@ -296,7 +296,7 @@ Can't get refcount for cluster 2: Input/output error
> Can't get refcount for cluster 3: Input/output error
> Rebuilding refcount structure
> Repairing cluster 1 refcount=1 reference=0
> -can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not repair dirty image: Input/output error
> --- Repairing ---
> Leaked cluster 1 refcount=1 reference=0
> Repairing cluster 1 refcount=1 reference=0
> diff --git a/tests/qemu-iotests/069.out b/tests/qemu-iotests/069.out
> index f97585677b..c78e8c2b72 100644
> --- a/tests/qemu-iotests/069.out
> +++ b/tests/qemu-iotests/069.out
> @@ -4,5 +4,5 @@ QA output created by 069
>
> Formatting 'TEST_DIR/t.IMGFMT.base', fmt=IMGFMT size=131072
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=131072 backing_file=TEST_DIR/t.IMGFMT.base
> -can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: Could not open backing file: Could not open 'TEST_DIR/t.IMGFMT.base': No such file or directory
> *** done
> diff --git a/tests/qemu-iotests/070.out b/tests/qemu-iotests/070.out
> index c269d99483..c7c567344c 100644
> --- a/tests/qemu-iotests/070.out
> +++ b/tests/qemu-iotests/070.out
> @@ -1,7 +1,7 @@
> QA output created by 070
>
> === Verify open image read-only fails, due to dirty log ===
> -can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
> +qemu-io: can't open device TEST_DIR/iotest-dirtylog-10G-4M.vhdx: VHDX image file 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx' opened read-only, but contains a log that needs to be replayed
> To replay the log, run:
> qemu-img check -r all 'TEST_DIR/iotest-dirtylog-10G-4M.vhdx'
> === Verify open image replays log ===
> diff --git a/tests/qemu-iotests/075.out b/tests/qemu-iotests/075.out
> index b234b758e0..4f3871d337 100644
> --- a/tests/qemu-iotests/075.out
> +++ b/tests/qemu-iotests/075.out
> @@ -9,23 +9,23 @@ read 512/512 bytes at offset 1048064
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == block_size must be a multiple of 512 ==
> -can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 513 must be a multiple of 512
>
> == block_size cannot be zero ==
> -can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size cannot be zero
>
> == huge block_size ===
> -can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: block_size 4294966784 must be 64 MB or less
>
> == offsets_size overflow ===
> -can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: n_blocks 4294967295 must be 536870911 or less
>
> == refuse images that require too many offsets ===
> -can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: image requires too many offsets, try increasing block size
>
> == refuse images with non-monotonically increasing offsets ==
> -can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: offsets not monotonically increasing at index 1, image file is corrupt
>
> == refuse images with invalid compressed block size ==
> -can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
> +qemu-io: can't open device TEST_DIR/simple-pattern.cloop: invalid compressed block size at index 1, image file is corrupt
> *** done
> diff --git a/tests/qemu-iotests/076.out b/tests/qemu-iotests/076.out
> index 9c66c5fb46..2de8a710a5 100644
> --- a/tests/qemu-iotests/076.out
> +++ b/tests/qemu-iotests/076.out
> @@ -5,13 +5,13 @@ read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == Negative catalog size ==
> -can't open device TEST_DIR/parallels-v1: Catalog too large
> +qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
>
> == Overflow in catalog allocation ==
> -can't open device TEST_DIR/parallels-v1: Catalog too large
> +qemu-io: can't open device TEST_DIR/parallels-v1: Catalog too large
>
> == Zero sectors per track ==
> -can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
> +qemu-io: can't open device TEST_DIR/parallels-v1: Invalid image: Zero sectors per track
>
> == Read from a valid v2 image ==
> read 65536/65536 bytes at offset 0
> diff --git a/tests/qemu-iotests/078.out b/tests/qemu-iotests/078.out
> index c3d6aa4fe4..4a82e1779f 100644
> --- a/tests/qemu-iotests/078.out
> +++ b/tests/qemu-iotests/078.out
> @@ -5,18 +5,18 @@ read 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == Negative catalog size ==
> -can't open device TEST_DIR/empty.bochs: Catalog size is too large
> +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
>
> == Overflow for catalog size * sizeof(uint32_t) ==
> -can't open device TEST_DIR/empty.bochs: Catalog size is too large
> +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too large
>
> == Too small catalog bitmap for image size ==
> -can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
> -can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
> +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
> +qemu-io: can't open device TEST_DIR/empty.bochs: Catalog size is too small for this disk size
>
> == Negative extent size ==
> -can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
> +qemu-io: can't open device TEST_DIR/empty.bochs: Extent size 2147483648 is too large
>
> == Zero extent size ==
> -can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
> +qemu-io: can't open device TEST_DIR/empty.bochs: Extent size must be at least 512
> *** done
> diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out
> index 281c7e0d1d..45ab01db8e 100644
> --- a/tests/qemu-iotests/080.out
> +++ b/tests/qemu-iotests/080.out
> @@ -2,34 +2,34 @@ QA output created by 080
>
> == Huge header size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
> -can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
> +qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
> +qemu-io: can't open device TEST_DIR/t.qcow2: qcow2 header exceeds cluster size
>
> == Huge unknown header extension ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Invalid backing file offset
> -can't open device TEST_DIR/t.qcow2: Header extension too large
> -can't open device TEST_DIR/t.qcow2: Header extension too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Invalid backing file offset
> +qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Header extension too large
>
> == Huge refcount table size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Reference count table too large
> -can't open device TEST_DIR/t.qcow2: Reference count table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table too large
>
> == Misaligned refcount table ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
>
> == Huge refcount offset ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Reference count table offset invalid
>
> == Invalid snapshot table ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Snapshot table too large
> -can't open device TEST_DIR/t.qcow2: Snapshot table too large
> -can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
> -can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Snapshot table offset invalid
>
> == Hitting snapshot table size limit ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> @@ -39,10 +39,10 @@ read 512/512 bytes at offset 0
>
> == Invalid L1 table ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Active L1 table too large
> -can't open device TEST_DIR/t.qcow2: Active L1 table too large
> -can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
> -can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table too large
> +qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
> +qemu-io: can't open device TEST_DIR/t.qcow2: Active L1 table offset invalid
>
> == Invalid L1 table (with internal snapshot in the image) ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> @@ -50,7 +50,7 @@ qemu-img: Could not open 'TEST_DIR/t.IMGFMT': L1 table is too small
>
> == Invalid backing file size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: Backing file name too long
> +qemu-io: can't open device TEST_DIR/t.qcow2: Backing file name too long
>
> == Invalid L2 entry (huge physical offset) ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> @@ -66,7 +66,7 @@ wrote 512/512 bytes at offset 0
> qemu-img: Failed to load snapshot: Snapshot L1 table offset invalid
> qemu-img: Snapshot L1 table offset invalid
> qemu-img: Failed to turn zero into data clusters: Invalid argument
> -Failed to flush the refcount block cache: Invalid argument
> +qemu-io: Failed to flush the refcount block cache: Invalid argument
> write failed: Invalid argument
> qemu-img: Snapshot L1 table offset invalid
> qemu-img: Could not apply snapshot 'test': Failed to load snapshot: Invalid argument
> @@ -89,7 +89,7 @@ wrote 512/512 bytes at offset 0
> qemu-img: Failed to load snapshot: Snapshot L1 table too large
> qemu-img: Snapshot L1 table too large
> qemu-img: Failed to turn zero into data clusters: File too large
> -Failed to flush the refcount block cache: File too large
> +qemu-io: Failed to flush the refcount block cache: File too large
> write failed: File too large
> qemu-img: Snapshot L1 table too large
> qemu-img: Could not apply snapshot 'test': Failed to load snapshot: File too large
> diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
> index 8ec1783ffe..04091b64e5 100644
> --- a/tests/qemu-iotests/081.out
> +++ b/tests/qemu-iotests/081.out
> @@ -70,7 +70,7 @@ read 10485760/10485760 bytes at offset 0
> 10 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == checking the blkverify mode with invalid settings ==
> -can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
> +qemu-io: can't open: blkverify=on can only be set if there are exactly two files and vote-threshold is 2
>
> == dynamically adding a child to a quorum ==
> Testing:
> diff --git a/tests/qemu-iotests/088.out b/tests/qemu-iotests/088.out
> index 1f6bcf0abc..814be7181d 100644
> --- a/tests/qemu-iotests/088.out
> +++ b/tests/qemu-iotests/088.out
> @@ -2,10 +2,10 @@ QA output created by 088
>
> == Invalid block size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.vpc: Invalid block size 0
> -can't open device TEST_DIR/t.vpc: Invalid block size 0
> -can't open device TEST_DIR/t.vpc: Invalid block size 128
> -can't open device TEST_DIR/t.vpc: Invalid block size 128
> -can't open device TEST_DIR/t.vpc: Invalid block size 305419896
> -can't open device TEST_DIR/t.vpc: Invalid block size 305419896
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 0
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 128
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
> +qemu-io: can't open device TEST_DIR/t.vpc: Invalid block size 305419896
> *** done
> diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out
> index bd9eec3250..16704cf499 100644
> --- a/tests/qemu-iotests/103.out
> +++ b/tests/qemu-iotests/103.out
> @@ -5,13 +5,13 @@ wrote 65536/65536 bytes at offset 0
>
> === Testing invalid option combinations ===
>
> -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> -can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
> -can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
> -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> -can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> -can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> -can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
>
> === Testing valid option combinations ===
>
> diff --git a/tests/qemu-iotests/114.out b/tests/qemu-iotests/114.out
> index 1a47a526b9..22dc66c633 100644
> --- a/tests/qemu-iotests/114.out
> +++ b/tests/qemu-iotests/114.out
> @@ -7,7 +7,7 @@ virtual size: 64M (67108864 bytes)
> cluster_size: 65536
> backing file: TEST_DIR/t.IMGFMT.base
> backing file format: foo
> -can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
> +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open backing file: Unknown driver 'foo'
> no file open, try 'help open'
> read 4096/4096 bytes at offset 0
> 4 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> diff --git a/tests/qemu-iotests/116.out b/tests/qemu-iotests/116.out
> index 24bee57783..49f9a261a0 100644
> --- a/tests/qemu-iotests/116.out
> +++ b/tests/qemu-iotests/116.out
> @@ -2,29 +2,29 @@ QA output created by 116
>
> == truncated header cluster ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid header magic ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Image not in QED format
> +qemu-io: can't open device TEST_DIR/t.qed: Image not in QED format
>
> == invalid cluster size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid table size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid header size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid L1 table offset ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
>
> == invalid image size ==
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
> -can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> +qemu-io: can't open device TEST_DIR/t.qed: Could not open 'TEST_DIR/t.qed': Invalid argument
> *** done
> diff --git a/tests/qemu-iotests/131.out b/tests/qemu-iotests/131.out
> index 27c2c5389b..70da03dee5 100644
> --- a/tests/qemu-iotests/131.out
> +++ b/tests/qemu-iotests/131.out
> @@ -22,7 +22,7 @@ read 32768/32768 bytes at offset 163840
> read 32768/32768 bytes at offset 0
> 32 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> == Corrupt image ==
> -can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
> +qemu-io: can't open device TEST_DIR/t.parallels: parallels: Image was not closed correctly; cannot be opened read/write
> ERROR image was not closed correctly
>
> 1 errors were found on the image.
> diff --git a/tests/qemu-iotests/133.out b/tests/qemu-iotests/133.out
> index 414c7fa27f..1491ef45a9 100644
> --- a/tests/qemu-iotests/133.out
> +++ b/tests/qemu-iotests/133.out
> @@ -4,18 +4,18 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=TEST_DIR/t
>
> === Check that node-name can't be changed ===
>
> -Cannot change the option 'node-name'
> -Cannot change the option 'node-name'
> -Cannot change the option 'node-name'
> +qemu-io: Cannot change the option 'node-name'
> +qemu-io: Cannot change the option 'node-name'
> +qemu-io: Cannot change the option 'node-name'
>
> === Check that unchanged node-name is okay ===
>
>
> === Check that driver can't be changed ===
>
> -Cannot change the option 'driver'
> -Cannot change the option 'driver'
> -Cannot change the option 'driver'
> +qemu-io: Cannot change the option 'driver'
> +qemu-io: Cannot change the option 'driver'
> +qemu-io: Cannot change the option 'driver'
>
> === Check that unchanged driver is okay ===
>
> @@ -27,16 +27,16 @@ format name: null-co
>
> === Check that mixing -c/-r/-w and their corresponding options is forbidden ===
>
> -Cannot set both -r/-w and 'read-only'
> -Cannot set both -r/-w and 'read-only'
> -Cannot set both -c and the cache options
> -Cannot set both -c and the cache options
> -Cannot set both -c and the cache options
> +qemu-io: Cannot set both -r/-w and 'read-only'
> +qemu-io: Cannot set both -r/-w and 'read-only'
> +qemu-io: Cannot set both -c and the cache options
> +qemu-io: Cannot set both -c and the cache options
> +qemu-io: Cannot set both -c and the cache options
>
> === Check that invalid options are handled correctly ===
>
> -Parameter 'read-only' expects 'on' or 'off'
> -Parameter 'cache.no-flush' expects 'on' or 'off'
> -Parameter 'cache.direct' expects 'on' or 'off'
> -Parameter 'auto-read-only' expects 'on' or 'off'
> +qemu-io: Parameter 'read-only' expects 'on' or 'off'
> +qemu-io: Parameter 'cache.no-flush' expects 'on' or 'off'
> +qemu-io: Parameter 'cache.direct' expects 'on' or 'off'
> +qemu-io: Parameter 'auto-read-only' expects 'on' or 'off'
> *** done
> diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out
> index 2c080b72f3..22d59df40c 100644
> --- a/tests/qemu-iotests/137.out
> +++ b/tests/qemu-iotests/137.out
> @@ -15,24 +15,24 @@ read 33554432/33554432 bytes at offset 0
>
> === Try setting some invalid values ===
>
> -Parameter 'lazy-refcounts' expects 'on' or 'off'
> -cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> -l2-cache-size may not exceed cache-size
> -refcount-cache-size may not exceed cache-size
> -L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> -L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> -Refcount cache size too big
> -Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
> -Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> -Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> -Cache clean interval too big
> +qemu-io: Parameter 'lazy-refcounts' expects 'on' or 'off'
> +qemu-io: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time
> +qemu-io: l2-cache-size may not exceed cache-size
> +qemu-io: refcount-cache-size may not exceed cache-size
> +qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: L2 cache entry size must be a power of two between 512 and the cluster size (65536)
> +qemu-io: Refcount cache size too big
> +qemu-io: Conflicting values for qcow2 options 'overlap-check' ('constant') and 'overlap-check.template' ('all')
> +qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> +qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> +qemu-io: Cache clean interval too big
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=36028797018963968
> -L2 cache size too big
> +qemu-io: L2 cache size too big
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>
> === Test transaction semantics ===
>
> -Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> +qemu-io: Unsupported value 'blubb' for qcow2 option 'overlap-check'. Allowed are any of the following: none, constant, cached, all
> wrote 512/512 bytes at offset 0
> 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> ./common.rc: Killed ( if [ "${VALGRIND_QEMU}" == "y" ]; then
> @@ -44,7 +44,7 @@ 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)
> -Parameter 'lazy-refcounts' expects 'on' or 'off'
> +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
> write failed: Input/output error
> *** done
> diff --git a/tests/qemu-iotests/140.out b/tests/qemu-iotests/140.out
> index 704adcef40..67fe44a3e3 100644
> --- a/tests/qemu-iotests/140.out
> +++ b/tests/qemu-iotests/140.out
> @@ -8,7 +8,7 @@ wrote 65536/65536 bytes at offset 0
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> {"return": {}}
> -can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
> +qemu-io: can't open device nbd+unix:///drv?socket=TEST_DIR/nbd: Requested export not available
> server reported: export 'drv' not present
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
> diff --git a/tests/qemu-iotests/143.out b/tests/qemu-iotests/143.out
> index 3e55fcd0ac..ee71b5aa42 100644
> --- a/tests/qemu-iotests/143.out
> +++ b/tests/qemu-iotests/143.out
> @@ -1,7 +1,7 @@
> QA output created by 143
> {"return": {}}
> {"return": {}}
> -can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
> +qemu-io: can't open device nbd+unix:///no_such_export?socket=TEST_DIR/nbd: Requested export not available
> server reported: export 'no_such_export' not present
> {"return": {}}
> {"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN", "data": {"guest": false, "reason": "host-qmp-quit"}}
> diff --git a/tests/qemu-iotests/153.out b/tests/qemu-iotests/153.out
> index 9747ce3c41..021c1cb899 100644
> --- a/tests/qemu-iotests/153.out
> +++ b/tests/qemu-iotests/153.out
> @@ -23,20 +23,20 @@ Is another process using the image [TEST_DIR/t.qcow2]?
> == Running utility commands ==
>
> _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
>
> _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
>
> _qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> no file open, try 'help open'
>
> _qemu_io_wrapper -c open -r TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get shared "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> no file open, try 'help open'
>
> @@ -100,12 +100,12 @@ file format: IMGFMT
> == Running utility commands -U ==
>
> _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
>
> _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
>
> _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> no file open, try 'help open'
>
> _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
> @@ -166,13 +166,13 @@ Is another process using the image [TEST_DIR/t.qcow2]?
> == Running utility commands ==
>
> _qemu_io_wrapper -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
>
> _qemu_io_wrapper -r -c read 0 512 TEST_DIR/t.qcow2
>
> _qemu_io_wrapper -c open TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> no file open, try 'help open'
>
> @@ -222,12 +222,12 @@ file format: IMGFMT
> == Running utility commands -U ==
>
> _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
>
> _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
>
> _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> no file open, try 'help open'
>
> _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
> @@ -325,12 +325,12 @@ file format: IMGFMT
> == Running utility commands -U ==
>
> _qemu_io_wrapper -U -c read 0 512 TEST_DIR/t.qcow2
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
>
> _qemu_io_wrapper -U -r -c read 0 512 TEST_DIR/t.qcow2
>
> _qemu_io_wrapper -c open -U TEST_DIR/t.qcow2 -c read 0 512
> -can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> +qemu-io: can't open device TEST_DIR/t.qcow2: force-share=on can only be used with read-only images
> no file open, try 'help open'
>
> _qemu_io_wrapper -c open -r -U TEST_DIR/t.qcow2 -c read 0 512
> @@ -420,7 +420,7 @@ Adding drive
> {"return": "OKrn"}
>
> _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> Creating overlay with qemu-img when the guest is running should be allowed
>
> @@ -437,7 +437,7 @@ _qemu_img_wrapper info TEST_DIR/t.qcow2
> {"return": ""}
>
> _qemu_io_wrapper TEST_DIR/t.qcow2 -c write 0 512
> -can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> +qemu-io: can't open device TEST_DIR/t.qcow2: Failed to get "write" lock
> Is another process using the image [TEST_DIR/t.qcow2]?
> Closing the other
> {"return": ""}
> @@ -458,5 +458,5 @@ qemu-img: --force-share/-U conflicts with image options
> No conflict:
>
> Conflict:
> --U conflicts with image options
> +qemu-io: -U conflicts with image options
> *** done
> diff --git a/tests/qemu-iotests/187.out b/tests/qemu-iotests/187.out
> index 30b987f71f..86203d8abc 100644
> --- a/tests/qemu-iotests/187.out
> +++ b/tests/qemu-iotests/187.out
> @@ -3,16 +3,16 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
>
> Start from read-only
>
> -Block node is read-only
> +qemu-io: Block node is read-only
> wrote 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -Block node is read-only
> +qemu-io: Block node is read-only
>
> Start from read-write
>
> wrote 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -Block node is read-only
> +qemu-io: Block node is read-only
> wrote 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> *** done
> diff --git a/tests/qemu-iotests/188.out b/tests/qemu-iotests/188.out
> index 8af24e5d8b..97b1402671 100644
> --- a/tests/qemu-iotests/188.out
> +++ b/tests/qemu-iotests/188.out
> @@ -14,5 +14,5 @@ read 16777216/16777216 bytes at offset 0
> 16 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>
> == verify open failure with wrong password ==
> -can't open: Invalid password, cannot unlock any keyslot
> +qemu-io: can't open: Invalid password, cannot unlock any keyslot
> *** done
> diff --git a/tests/qemu-iotests/197.out b/tests/qemu-iotests/197.out
> index 8febda5dea..7ca46be6e4 100644
> --- a/tests/qemu-iotests/197.out
> +++ b/tests/qemu-iotests/197.out
> @@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024
> 2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> read 1024/1024 bytes at offset 3221226496
> 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
> +qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Can't use copy-on-read on read-only device
> 2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
> 1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
> 64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
> diff --git a/tests/qemu-iotests/205 b/tests/qemu-iotests/205
> index 31b2f5707a..69f2c1d392 100755
> --- a/tests/qemu-iotests/205
> +++ b/tests/qemu-iotests/205
> @@ -78,7 +78,7 @@ class TestNbdServerRemove(iotests.QMPTestCase):
>
> def assertConnectFailed(self, qemu_io_output):
> self.assertEqual(filter_qemu_io(qemu_io_output).strip(),
> - "can't open device " + nbd_uri +
> + "qemu-io: can't open device " + nbd_uri +
> ": Requested export not available\n"
> "server reported: export 'exp' not present")
>
> diff --git a/tests/qemu-iotests/215.out b/tests/qemu-iotests/215.out
> index 70b0f5fb19..5a2fe40d03 100644
> --- a/tests/qemu-iotests/215.out
> +++ b/tests/qemu-iotests/215.out
> @@ -16,7 +16,7 @@ read 2147483136/2147483136 bytes at offset 1024
> 2 GiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> read 1024/1024 bytes at offset 3221226496
> 1 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
> +qemu-io: can't open device TEST_DIR/t.wrap.qcow2: Block node is read-only
> 2 GiB (0x80010000) bytes allocated at offset 0 bytes (0x0)
> 1023.938 MiB (0x3fff0000) bytes not allocated at offset 2 GiB (0x80010000)
> 64 KiB (0x10000) bytes allocated at offset 3 GiB (0xc0000000)
> diff --git a/tests/qemu-iotests/226.out b/tests/qemu-iotests/226.out
> index 8c0d060ffc..42be973ff2 100644
> --- a/tests/qemu-iotests/226.out
> +++ b/tests/qemu-iotests/226.out
> @@ -3,24 +3,24 @@ QA output created by 226
> === Testing with driver:file ===
>
> == Testing RO ==
> -can't open: A regular file was expected by the 'file' driver, but something else was given
> -warning: Opening a character device as a file using the 'file' driver is deprecated
> +qemu-io: can't open: A regular file was expected by the 'file' driver, but something else was given
> +qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
> == Testing RW ==
> -can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> -warning: Opening a character device as a file using the 'file' driver is deprecated
> +qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> +qemu-io: warning: Opening a character device as a file using the 'file' driver is deprecated
>
> === Testing with driver:host_device ===
>
> == Testing RO ==
> -can't open: 'host_device' driver expects either a character or block device
> +qemu-io: can't open: 'host_device' driver expects either a character or block device
> == Testing RW ==
> -can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> +qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
>
> === Testing with driver:host_cdrom ===
>
> == Testing RO ==
> -can't open: 'host_cdrom' driver expects either a character or block device
> +qemu-io: can't open: 'host_cdrom' driver expects either a character or block device
> == Testing RW ==
> -can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
> +qemu-io: can't open: Could not open 'TEST_DIR/t.IMGFMT': Is a directory
>
> *** done
> diff --git a/tests/qemu-iotests/244.out b/tests/qemu-iotests/244.out
> index 98e5946976..6a3d0067cc 100644
> --- a/tests/qemu-iotests/244.out
> +++ b/tests/qemu-iotests/244.out
> @@ -9,22 +9,22 @@ read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> no file open, try 'help open'
>
> Data file required, but without data file name in the image:
> -can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
> +qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' is required for this image
> no file open, try 'help open'
> read 65536/65536 bytes at offset 0
> 64 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> -can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> no file open, try 'help open'
>
> Setting data-file for an image with internal data:
> Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
> -can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
> +qemu-io: can't open device TEST_DIR/t.qcow2: 'data-file' can only be set for images with an external data file
> no file open, try 'help open'
> -can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> +qemu-io: can't open device TEST_DIR/t.qcow2: Could not open 'inexistent': No such file or directory
> no file open, try 'help open'
>
> === Conflicting features ===
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
"check -raw 005" fails when running on ext4 filesystems - these do not
support such large sparse files. Use the same check as in test 220 to
skip the test in this case.
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/005 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index 2fef63af88..6136ced5c8 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
_notrun "image protocol $IMGPROTO does not support large image sizes"
fi
+# Sanity check: For raw, we require a file system that permits the creation
+# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
+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"
+fi
+
echo
echo "creating large image"
_make_test_img 5000G
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
"check -raw 005" fails when running on ext4 filesystems - these do not
support such large sparse files. Use the same check as in test 220 to
skip the test in this case.
Suggested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/005 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
index 2fef63af88..6136ced5c8 100755
--- a/tests/qemu-iotests/005
+++ b/tests/qemu-iotests/005
@@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
_notrun "image protocol $IMGPROTO does not support large image sizes"
fi
+# Sanity check: For raw, we require a file system that permits the creation
+# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
+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"
+fi
+
echo
echo "creating large image"
_make_test_img 5000G
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 11:08 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 11:08 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> "check -raw 005" fails when running on ext4 filesystems - these do not
> support such large sparse files. Use the same check as in test 220 to
> skip the test in this case.
>
> Suggested-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/qemu-iotests/005 | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
> index 2fef63af88..6136ced5c8 100755
> --- a/tests/qemu-iotests/005
> +++ b/tests/qemu-iotests/005
> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
> _notrun "image protocol $IMGPROTO does not support large image sizes"
> fi
>
> +# Sanity check: For raw, we require a file system that permits the creation
> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
Is this comment correct? Running on my ext4 home partition this test
seems to be running fine and not skipping. Indeed:
12:06:29 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + pwd
/home/alex/lsrc/qemu.git/builds/kvm/tests/qemu-iotests
12:07:12 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + stat -f -c %T .
ext2/ext3
12:07:40 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + touch scratch/t.img
12:07:45 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + truncate --size=5T scratch/t.img
12:07:47 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + ls -lh scratch/t.img
-rw-r--r-- 1 alex alex 5.0T May 1 12:07 scratch/t.img
12:07:51 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + stat -f -c %T scratch/t.img
ext2/ext3
12:07:58 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + du -sh scratch/
4.0K scratch/
> +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"
> +fi
> +
> echo
> echo "creating large image"
> _make_test_img 5000G
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 11:08 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 11:08 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> "check -raw 005" fails when running on ext4 filesystems - these do not
> support such large sparse files. Use the same check as in test 220 to
> skip the test in this case.
>
> Suggested-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/qemu-iotests/005 | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
> index 2fef63af88..6136ced5c8 100755
> --- a/tests/qemu-iotests/005
> +++ b/tests/qemu-iotests/005
> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
> _notrun "image protocol $IMGPROTO does not support large image sizes"
> fi
>
> +# Sanity check: For raw, we require a file system that permits the creation
> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
Is this comment correct? Running on my ext4 home partition this test
seems to be running fine and not skipping. Indeed:
12:06:29 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + pwd
/home/alex/lsrc/qemu.git/builds/kvm/tests/qemu-iotests
12:07:12 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + stat -f -c %T .
ext2/ext3
12:07:40 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + touch scratch/t.img
12:07:45 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + truncate --size=5T scratch/t.img
12:07:47 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + ls -lh scratch/t.img
-rw-r--r-- 1 alex alex 5.0T May 1 12:07 scratch/t.img
12:07:51 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + stat -f -c %T scratch/t.img
ext2/ext3
12:07:58 [alex@idun:~/l/q/b/k/t/qemu-iotests] review/iotests-fixup-v2 + du -sh scratch/
4.0K scratch/
> +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"
> +fi
> +
> echo
> echo "creating large image"
> _make_test_img 5000G
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 12:06 ` Eric Blake
0 siblings, 0 replies; 62+ messages in thread
From: Eric Blake @ 2019-05-01 12:06 UTC (permalink / raw)
To: Alex Bennée, Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]
On 5/1/19 6:08 AM, Alex Bennée wrote:
>
> Thomas Huth <thuth@redhat.com> writes:
>
>> "check -raw 005" fails when running on ext4 filesystems - these do not
>> support such large sparse files. Use the same check as in test 220 to
>> skip the test in this case.
>>
>> Suggested-by: Eric Blake <eblake@redhat.com>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> tests/qemu-iotests/005 | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
>> index 2fef63af88..6136ced5c8 100755
>> --- a/tests/qemu-iotests/005
>> +++ b/tests/qemu-iotests/005
>> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
>> _notrun "image protocol $IMGPROTO does not support large image sizes"
>> fi
>>
>> +# Sanity check: For raw, we require a file system that permits the creation
>> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
>
> Is this comment correct? Running on my ext4 home partition this test
> seems to be running fine and not skipping. Indeed:
>> +if [ "$IMGFMT" = "raw" ]; then
>> + if ! truncate --size=5T "$TEST_IMG"; then
5T fits on ext4 but not ext3. This is not a straight copy from 220
(where the size in question was even bigger, at 513T), so the comment is
indeed slightly inaccurate; it may be worth figuring out which file
system actually failed to update the comment. But the code change is
correct once the comments are fixed.
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 12:06 ` Eric Blake
0 siblings, 0 replies; 62+ messages in thread
From: Eric Blake @ 2019-05-01 12:06 UTC (permalink / raw)
To: Alex Bennée, Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block, Markus Armbruster,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Philippe Mathieu-Daudé,
Li-Wen Hsu
[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]
On 5/1/19 6:08 AM, Alex Bennée wrote:
>
> Thomas Huth <thuth@redhat.com> writes:
>
>> "check -raw 005" fails when running on ext4 filesystems - these do not
>> support such large sparse files. Use the same check as in test 220 to
>> skip the test in this case.
>>
>> Suggested-by: Eric Blake <eblake@redhat.com>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> tests/qemu-iotests/005 | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
>> index 2fef63af88..6136ced5c8 100755
>> --- a/tests/qemu-iotests/005
>> +++ b/tests/qemu-iotests/005
>> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
>> _notrun "image protocol $IMGPROTO does not support large image sizes"
>> fi
>>
>> +# Sanity check: For raw, we require a file system that permits the creation
>> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
>
> Is this comment correct? Running on my ext4 home partition this test
> seems to be running fine and not skipping. Indeed:
>> +if [ "$IMGFMT" = "raw" ]; then
>> + if ! truncate --size=5T "$TEST_IMG"; then
5T fits on ext4 but not ext3. This is not a straight copy from 220
(where the size in question was even bigger, at 513T), so the comment is
indeed slightly inaccurate; it may be worth figuring out which file
system actually failed to update the comment. But the code change is
correct once the comments are fixed.
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 13:36 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-05-01 13:36 UTC (permalink / raw)
To: Eric Blake, Alex Bennée
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block, Markus Armbruster,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Philippe Mathieu-Daudé,
Li-Wen Hsu
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
On 01/05/2019 14.06, Eric Blake wrote:
> On 5/1/19 6:08 AM, Alex Bennée wrote:
>>
>> Thomas Huth <thuth@redhat.com> writes:
>>
>>> "check -raw 005" fails when running on ext4 filesystems - these do not
>>> support such large sparse files. Use the same check as in test 220 to
>>> skip the test in this case.
>>>
>>> Suggested-by: Eric Blake <eblake@redhat.com>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>> tests/qemu-iotests/005 | 9 +++++++++
>>> 1 file changed, 9 insertions(+)
>>>
>>> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
>>> index 2fef63af88..6136ced5c8 100755
>>> --- a/tests/qemu-iotests/005
>>> +++ b/tests/qemu-iotests/005
>>> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
>>> _notrun "image protocol $IMGPROTO does not support large image sizes"
>>> fi
>>>
>>> +# Sanity check: For raw, we require a file system that permits the creation
>>> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
>>
>> Is this comment correct? Running on my ext4 home partition this test
>> seems to be running fine and not skipping. Indeed:
>
>>> +if [ "$IMGFMT" = "raw" ]; then
>>> + if ! truncate --size=5T "$TEST_IMG"; then
>
> 5T fits on ext4 but not ext3.
It fails for me on my ext4 partition. Anyway, I'll change the comment.
Thomas
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 13:36 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-05-01 13:36 UTC (permalink / raw)
To: Eric Blake, Alex Bennée
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block, Markus Armbruster,
Christophe Fergeau, qemu-devel, Wainer dos Santos Moschetta,
Max Reitz, Philippe Mathieu-Daudé,
Li-Wen Hsu
[-- Attachment #1: Type: text/plain, Size: 1351 bytes --]
On 01/05/2019 14.06, Eric Blake wrote:
> On 5/1/19 6:08 AM, Alex Bennée wrote:
>>
>> Thomas Huth <thuth@redhat.com> writes:
>>
>>> "check -raw 005" fails when running on ext4 filesystems - these do not
>>> support such large sparse files. Use the same check as in test 220 to
>>> skip the test in this case.
>>>
>>> Suggested-by: Eric Blake <eblake@redhat.com>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>> tests/qemu-iotests/005 | 9 +++++++++
>>> 1 file changed, 9 insertions(+)
>>>
>>> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
>>> index 2fef63af88..6136ced5c8 100755
>>> --- a/tests/qemu-iotests/005
>>> +++ b/tests/qemu-iotests/005
>>> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
>>> _notrun "image protocol $IMGPROTO does not support large image sizes"
>>> fi
>>>
>>> +# Sanity check: For raw, we require a file system that permits the creation
>>> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
>>
>> Is this comment correct? Running on my ext4 home partition this test
>> seems to be running fine and not skipping. Indeed:
>
>>> +if [ "$IMGFMT" = "raw" ]; then
>>> + if ! truncate --size=5T "$TEST_IMG"; then
>
> 5T fits on ext4 but not ext3.
It fails for me on my ext4 partition. Anyway, I'll change the comment.
Thomas
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 13:13 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-05-01 13:13 UTC (permalink / raw)
To: Alex Bennée
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
On 01/05/2019 13.08, Alex Bennée wrote:
>
> Thomas Huth <thuth@redhat.com> writes:
>
>> "check -raw 005" fails when running on ext4 filesystems - these do not
>> support such large sparse files. Use the same check as in test 220 to
>> skip the test in this case.
>>
>> Suggested-by: Eric Blake <eblake@redhat.com>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> tests/qemu-iotests/005 | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
>> index 2fef63af88..6136ced5c8 100755
>> --- a/tests/qemu-iotests/005
>> +++ b/tests/qemu-iotests/005
>> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
>> _notrun "image protocol $IMGPROTO does not support large image sizes"
>> fi
>>
>> +# Sanity check: For raw, we require a file system that permits the creation
>> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
>
> Is this comment correct? Running on my ext4 home partition this test
> seems to be running fine and not skipping.
Maybe it depends on the kernel version (I'm still using a 3.10-based
kernel here) or the way how the file system was created? It fails at
least for me on my ext4 partition.
But I can adjust a little bit for sure.
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 13:13 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-05-01 13:13 UTC (permalink / raw)
To: Alex Bennée
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
On 01/05/2019 13.08, Alex Bennée wrote:
>
> Thomas Huth <thuth@redhat.com> writes:
>
>> "check -raw 005" fails when running on ext4 filesystems - these do not
>> support such large sparse files. Use the same check as in test 220 to
>> skip the test in this case.
>>
>> Suggested-by: Eric Blake <eblake@redhat.com>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> tests/qemu-iotests/005 | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
>> index 2fef63af88..6136ced5c8 100755
>> --- a/tests/qemu-iotests/005
>> +++ b/tests/qemu-iotests/005
>> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
>> _notrun "image protocol $IMGPROTO does not support large image sizes"
>> fi
>>
>> +# Sanity check: For raw, we require a file system that permits the creation
>> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
>
> Is this comment correct? Running on my ext4 home partition this test
> seems to be running fine and not skipping.
Maybe it depends on the kernel version (I'm still using a 3.10-based
kernel here) or the way how the file system was created? It fails at
least for me on my ext4 partition.
But I can adjust a little bit for sure.
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 14:23 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 14:23 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> On 01/05/2019 13.08, Alex Bennée wrote:
>>
>> Thomas Huth <thuth@redhat.com> writes:
>>
>>> "check -raw 005" fails when running on ext4 filesystems - these do not
>>> support such large sparse files. Use the same check as in test 220 to
>>> skip the test in this case.
>>>
>>> Suggested-by: Eric Blake <eblake@redhat.com>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>> tests/qemu-iotests/005 | 9 +++++++++
>>> 1 file changed, 9 insertions(+)
>>>
>>> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
>>> index 2fef63af88..6136ced5c8 100755
>>> --- a/tests/qemu-iotests/005
>>> +++ b/tests/qemu-iotests/005
>>> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
>>> _notrun "image protocol $IMGPROTO does not support large image sizes"
>>> fi
>>>
>>> +# Sanity check: For raw, we require a file system that permits the creation
>>> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
>>
>> Is this comment correct? Running on my ext4 home partition this test
>> seems to be running fine and not skipping.
> Maybe it depends on the kernel version (I'm still using a 3.10-based
> kernel here) or the way how the file system was created? It fails at
> least for me on my ext4 partition.
> But I can adjust a little bit for sure.
# Sanity check: For raw, we require a file system that permits the
# creation of a HUGE (but very sparse) file. Check we can create such
# a file before continuing.
?
>
> Thomas
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 2/8] tests/qemu-iotests/005: Add a sanity check for large sparse file support
@ 2019-05-01 14:23 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 14:23 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> On 01/05/2019 13.08, Alex Bennée wrote:
>>
>> Thomas Huth <thuth@redhat.com> writes:
>>
>>> "check -raw 005" fails when running on ext4 filesystems - these do not
>>> support such large sparse files. Use the same check as in test 220 to
>>> skip the test in this case.
>>>
>>> Suggested-by: Eric Blake <eblake@redhat.com>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>> tests/qemu-iotests/005 | 9 +++++++++
>>> 1 file changed, 9 insertions(+)
>>>
>>> diff --git a/tests/qemu-iotests/005 b/tests/qemu-iotests/005
>>> index 2fef63af88..6136ced5c8 100755
>>> --- a/tests/qemu-iotests/005
>>> +++ b/tests/qemu-iotests/005
>>> @@ -55,6 +55,15 @@ if [ "$IMGPROTO" = "sheepdog" ]; then
>>> _notrun "image protocol $IMGPROTO does not support large image sizes"
>>> fi
>>>
>>> +# Sanity check: For raw, we require a file system that permits the creation
>>> +# of a HUGE (but very sparse) file. tmpfs works, ext4 does not.
>>
>> Is this comment correct? Running on my ext4 home partition this test
>> seems to be running fine and not skipping.
> Maybe it depends on the kernel version (I'm still using a 3.10-based
> kernel here) or the way how the file system was created? It fails at
> least for me on my ext4 partition.
> But I can adjust a little bit for sure.
# Sanity check: For raw, we require a file system that permits the
# creation of a HUGE (but very sparse) file. Check we can create such
# a file before continuing.
?
>
> Thomas
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
a default machine, so when running the qemu-iotests with such a binary,
lots of tests are failing. Fix it by picking a default machine in the
"check" script instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/check | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index f9c24b6753..922c5d1d3d 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -130,7 +130,6 @@ export CACHEMODE="writeback"
export QEMU_IO_OPTIONS=""
export QEMU_IO_OPTIONS_NO_FMT=""
export CACHEMODE_IS_DEFAULT=true
-export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
export VALGRIND_QEMU=
export IMGKEYSECRET=
export IMGOPTSSYNTAX=false
@@ -564,6 +563,18 @@ then
fi
export QEMU_PROG="$(type -p "$QEMU_PROG")"
+case "$QEMU_PROG" in
+ *qemu-system-arm|*qemu-system-aarch64)
+ export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
+ ;;
+ *qemu-system-tricore)
+ export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
+ ;;
+ *)
+ export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
+ ;;
+esac
+
if [ -z "$QEMU_IMG_PROG" ]; then
if [ -x "$build_iotests/qemu-img" ]; then
export QEMU_IMG_PROG="$build_iotests/qemu-img"
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
a default machine, so when running the qemu-iotests with such a binary,
lots of tests are failing. Fix it by picking a default machine in the
"check" script instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/check | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index f9c24b6753..922c5d1d3d 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -130,7 +130,6 @@ export CACHEMODE="writeback"
export QEMU_IO_OPTIONS=""
export QEMU_IO_OPTIONS_NO_FMT=""
export CACHEMODE_IS_DEFAULT=true
-export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
export VALGRIND_QEMU=
export IMGKEYSECRET=
export IMGOPTSSYNTAX=false
@@ -564,6 +563,18 @@ then
fi
export QEMU_PROG="$(type -p "$QEMU_PROG")"
+case "$QEMU_PROG" in
+ *qemu-system-arm|*qemu-system-aarch64)
+ export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
+ ;;
+ *qemu-system-tricore)
+ export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
+ ;;
+ *)
+ export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
+ ;;
+esac
+
if [ -z "$QEMU_IMG_PROG" ]; then
if [ -x "$build_iotests/qemu-img" ]; then
export QEMU_IMG_PROG="$build_iotests/qemu-img"
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary
@ 2019-05-01 8:27 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 8:27 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
> a default machine, so when running the qemu-iotests with such a binary,
> lots of tests are failing. Fix it by picking a default machine in the
> "check" script instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/qemu-iotests/check | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index f9c24b6753..922c5d1d3d 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -130,7 +130,6 @@ export CACHEMODE="writeback"
> export QEMU_IO_OPTIONS=""
> export QEMU_IO_OPTIONS_NO_FMT=""
> export CACHEMODE_IS_DEFAULT=true
> -export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> export VALGRIND_QEMU=
> export IMGKEYSECRET=
> export IMGOPTSSYNTAX=false
> @@ -564,6 +563,18 @@ then
> fi
> export QEMU_PROG="$(type -p "$QEMU_PROG")"
>
> +case "$QEMU_PROG" in
> + *qemu-system-arm|*qemu-system-aarch64)
> + export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
> + ;;
> + *qemu-system-tricore)
> + export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
> + ;;
> + *)
> + export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> + ;;
> +esac
> +
> if [ -z "$QEMU_IMG_PROG" ]; then
> if [ -x "$build_iotests/qemu-img" ]; then
> export QEMU_IMG_PROG="$build_iotests/qemu-img"
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary
@ 2019-05-01 8:27 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 8:27 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
> a default machine, so when running the qemu-iotests with such a binary,
> lots of tests are failing. Fix it by picking a default machine in the
> "check" script instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/qemu-iotests/check | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index f9c24b6753..922c5d1d3d 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -130,7 +130,6 @@ export CACHEMODE="writeback"
> export QEMU_IO_OPTIONS=""
> export QEMU_IO_OPTIONS_NO_FMT=""
> export CACHEMODE_IS_DEFAULT=true
> -export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> export VALGRIND_QEMU=
> export IMGKEYSECRET=
> export IMGOPTSSYNTAX=false
> @@ -564,6 +563,18 @@ then
> fi
> export QEMU_PROG="$(type -p "$QEMU_PROG")"
>
> +case "$QEMU_PROG" in
> + *qemu-system-arm|*qemu-system-aarch64)
> + export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
> + ;;
> + *qemu-system-tricore)
> + export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
> + ;;
> + *)
> + export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> + ;;
> +esac
> +
> if [ -z "$QEMU_IMG_PROG" ]; then
> if [ -x "$build_iotests/qemu-img" ]; then
> export QEMU_IMG_PROG="$build_iotests/qemu-img"
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary
@ 2019-05-01 15:18 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 62+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-01 15:18 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Wainer dos Santos Moschetta,
Markus Armbruster, Alex Bennée
On 4/28/19 5:54 PM, Thomas Huth wrote:
> qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
> a default machine, so when running the qemu-iotests with such a binary,
> lots of tests are failing. Fix it by picking a default machine in the
> "check" script instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> tests/qemu-iotests/check | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index f9c24b6753..922c5d1d3d 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -130,7 +130,6 @@ export CACHEMODE="writeback"
> export QEMU_IO_OPTIONS=""
> export QEMU_IO_OPTIONS_NO_FMT=""
> export CACHEMODE_IS_DEFAULT=true
> -export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> export VALGRIND_QEMU=
> export IMGKEYSECRET=
> export IMGOPTSSYNTAX=false
> @@ -564,6 +563,18 @@ then
> fi
> export QEMU_PROG="$(type -p "$QEMU_PROG")"
>
> +case "$QEMU_PROG" in
> + *qemu-system-arm|*qemu-system-aarch64)
> + export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
> + ;;
> + *qemu-system-tricore)
> + export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
> + ;;
> + *)
> + export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> + ;;
> +esac
> +
> if [ -z "$QEMU_IMG_PROG" ]; then
> if [ -x "$build_iotests/qemu-img" ]; then
> export QEMU_IMG_PROG="$build_iotests/qemu-img"
>
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 3/8] tests/qemu-iotests/check: Pick a default machine if necessary
@ 2019-05-01 15:18 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 62+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-01 15:18 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block, Alex Bennée,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu
On 4/28/19 5:54 PM, Thomas Huth wrote:
> qemu-system-arm, qemu-system-aarch64 and qemu-system-tricore do not have
> a default machine, so when running the qemu-iotests with such a binary,
> lots of tests are failing. Fix it by picking a default machine in the
> "check" script instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> tests/qemu-iotests/check | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
> index f9c24b6753..922c5d1d3d 100755
> --- a/tests/qemu-iotests/check
> +++ b/tests/qemu-iotests/check
> @@ -130,7 +130,6 @@ export CACHEMODE="writeback"
> export QEMU_IO_OPTIONS=""
> export QEMU_IO_OPTIONS_NO_FMT=""
> export CACHEMODE_IS_DEFAULT=true
> -export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> export VALGRIND_QEMU=
> export IMGKEYSECRET=
> export IMGOPTSSYNTAX=false
> @@ -564,6 +563,18 @@ then
> fi
> export QEMU_PROG="$(type -p "$QEMU_PROG")"
>
> +case "$QEMU_PROG" in
> + *qemu-system-arm|*qemu-system-aarch64)
> + export QEMU_OPTIONS="-nodefaults -machine virt,accel=qtest"
> + ;;
> + *qemu-system-tricore)
> + export QEMU_OPTIONS="-nodefaults -machine tricore_testboard,accel=qtest"
> + ;;
> + *)
> + export QEMU_OPTIONS="-nodefaults -machine accel=qtest"
> + ;;
> +esac
> +
> if [ -z "$QEMU_IMG_PROG" ]; then
> if [ -x "$build_iotests/qemu-img" ]; then
> export QEMU_IMG_PROG="$build_iotests/qemu-img"
>
^ permalink raw reply [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 4/8] tests/qemu-iotests: Do not hard-code the path to bash
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
bash is installed in a different directory on non-Linux systems like
FreeBSD. Do not hard-code /bin/bash here so that the tests can run
there, too.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/239 | 2 +-
tests/qemu-iotests/240 | 2 +-
tests/qemu-iotests/241 | 2 +-
tests/qemu-iotests/243 | 2 +-
tests/qemu-iotests/244 | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
index 6f085d573d..b0991ffe59 100755
--- a/tests/qemu-iotests/239
+++ b/tests/qemu-iotests/239
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test case for dmg
#
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index 65cc3b39b1..d3e663ed65 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test hot plugging and unplugging with iothreads
#
diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
index 017a736aab..58b64ebf41 100755
--- a/tests/qemu-iotests/241
+++ b/tests/qemu-iotests/241
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test qemu-nbd vs. unaligned images
#
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index 5838c6e89c..e563761307 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test qcow2 preallocation
#
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index d8e7122305..13978f93d2 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test qcow2 with external data files
#
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 4/8] tests/qemu-iotests: Do not hard-code the path to bash
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
bash is installed in a different directory on non-Linux systems like
FreeBSD. Do not hard-code /bin/bash here so that the tests can run
there, too.
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/239 | 2 +-
tests/qemu-iotests/240 | 2 +-
tests/qemu-iotests/241 | 2 +-
tests/qemu-iotests/243 | 2 +-
tests/qemu-iotests/244 | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
index 6f085d573d..b0991ffe59 100755
--- a/tests/qemu-iotests/239
+++ b/tests/qemu-iotests/239
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test case for dmg
#
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index 65cc3b39b1..d3e663ed65 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test hot plugging and unplugging with iothreads
#
diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
index 017a736aab..58b64ebf41 100755
--- a/tests/qemu-iotests/241
+++ b/tests/qemu-iotests/241
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test qemu-nbd vs. unaligned images
#
diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
index 5838c6e89c..e563761307 100755
--- a/tests/qemu-iotests/243
+++ b/tests/qemu-iotests/243
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test qcow2 preallocation
#
diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
index d8e7122305..13978f93d2 100755
--- a/tests/qemu-iotests/244
+++ b/tests/qemu-iotests/244
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
#
# Test qcow2 with external data files
#
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 4/8] tests/qemu-iotests: Do not hard-code the path to bash
@ 2019-05-01 8:27 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 8:27 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> bash is installed in a different directory on non-Linux systems like
> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
> there, too.
>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/qemu-iotests/239 | 2 +-
> tests/qemu-iotests/240 | 2 +-
> tests/qemu-iotests/241 | 2 +-
> tests/qemu-iotests/243 | 2 +-
> tests/qemu-iotests/244 | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
> index 6f085d573d..b0991ffe59 100755
> --- a/tests/qemu-iotests/239
> +++ b/tests/qemu-iotests/239
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test case for dmg
> #
> diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
> index 65cc3b39b1..d3e663ed65 100755
> --- a/tests/qemu-iotests/240
> +++ b/tests/qemu-iotests/240
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test hot plugging and unplugging with iothreads
> #
> diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
> index 017a736aab..58b64ebf41 100755
> --- a/tests/qemu-iotests/241
> +++ b/tests/qemu-iotests/241
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test qemu-nbd vs. unaligned images
> #
> diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
> index 5838c6e89c..e563761307 100755
> --- a/tests/qemu-iotests/243
> +++ b/tests/qemu-iotests/243
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test qcow2 preallocation
> #
> diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
> index d8e7122305..13978f93d2 100755
> --- a/tests/qemu-iotests/244
> +++ b/tests/qemu-iotests/244
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test qcow2 with external data files
> #
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 4/8] tests/qemu-iotests: Do not hard-code the path to bash
@ 2019-05-01 8:27 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 8:27 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> bash is installed in a different directory on non-Linux systems like
> FreeBSD. Do not hard-code /bin/bash here so that the tests can run
> there, too.
>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/qemu-iotests/239 | 2 +-
> tests/qemu-iotests/240 | 2 +-
> tests/qemu-iotests/241 | 2 +-
> tests/qemu-iotests/243 | 2 +-
> tests/qemu-iotests/244 | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qemu-iotests/239 b/tests/qemu-iotests/239
> index 6f085d573d..b0991ffe59 100755
> --- a/tests/qemu-iotests/239
> +++ b/tests/qemu-iotests/239
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test case for dmg
> #
> diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
> index 65cc3b39b1..d3e663ed65 100755
> --- a/tests/qemu-iotests/240
> +++ b/tests/qemu-iotests/240
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test hot plugging and unplugging with iothreads
> #
> diff --git a/tests/qemu-iotests/241 b/tests/qemu-iotests/241
> index 017a736aab..58b64ebf41 100755
> --- a/tests/qemu-iotests/241
> +++ b/tests/qemu-iotests/241
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test qemu-nbd vs. unaligned images
> #
> diff --git a/tests/qemu-iotests/243 b/tests/qemu-iotests/243
> index 5838c6e89c..e563761307 100755
> --- a/tests/qemu-iotests/243
> +++ b/tests/qemu-iotests/243
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test qcow2 preallocation
> #
> diff --git a/tests/qemu-iotests/244 b/tests/qemu-iotests/244
> index d8e7122305..13978f93d2 100755
> --- a/tests/qemu-iotests/244
> +++ b/tests/qemu-iotests/244
> @@ -1,4 +1,4 @@
> -#!/bin/bash
> +#!/usr/bin/env bash
> #
> # Test qcow2 with external data files
> #
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
We are going to enable the qemu-iotests during "make check" again,
and for running the iotests, we need bash and gnu-sed.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.cirrus.yml | 4 ++--
.travis.yml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 47ef5bc604..8326a3a4b1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,7 +7,7 @@ freebsd_12_task:
cpu: 8
memory: 8G
install_script: pkg install -y
- bison curl cyrus-sasl git glib gmake gnutls
+ bash bison curl cyrus-sasl git glib gmake gnutls gsed
nettle perl5 pixman pkgconf png usbredir
script:
- mkdir build
@@ -20,7 +20,7 @@ macos_task:
osx_instance:
image: mojave-base
install_script:
- - brew install pkg-config python glib pixman make sdl2
+ - brew install pkg-config python gnu-sed glib pixman make sdl2
script:
- ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
diff --git a/.travis.yml b/.travis.yml
index 2e06aee9d0..ba94644192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ addons:
packages:
- glib
- pixman
+ - gnu-sed
# The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
We are going to enable the qemu-iotests during "make check" again,
and for running the iotests, we need bash and gnu-sed.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
.cirrus.yml | 4 ++--
.travis.yml | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/.cirrus.yml b/.cirrus.yml
index 47ef5bc604..8326a3a4b1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -7,7 +7,7 @@ freebsd_12_task:
cpu: 8
memory: 8G
install_script: pkg install -y
- bison curl cyrus-sasl git glib gmake gnutls
+ bash bison curl cyrus-sasl git glib gmake gnutls gsed
nettle perl5 pixman pkgconf png usbredir
script:
- mkdir build
@@ -20,7 +20,7 @@ macos_task:
osx_instance:
image: mojave-base
install_script:
- - brew install pkg-config python glib pixman make sdl2
+ - brew install pkg-config python gnu-sed glib pixman make sdl2
script:
- ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
- gmake -j$(sysctl -n hw.ncpu)
diff --git a/.travis.yml b/.travis.yml
index 2e06aee9d0..ba94644192 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,6 +42,7 @@ addons:
packages:
- glib
- pixman
+ - gnu-sed
# The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
@ 2019-04-30 21:54 ` Li-Wen Hsu
0 siblings, 0 replies; 62+ messages in thread
From: Li-Wen Hsu @ 2019-04-30 21:54 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
On Mon, Apr 29, 2019 at 12:55 AM Thomas Huth <thuth@redhat.com> wrote:
>
> We are going to enable the qemu-iotests during "make check" again,
> and for running the iotests, we need bash and gnu-sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Li-Wen Hsu <lwhsu@freebsd.org>
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
@ 2019-04-30 21:54 ` Li-Wen Hsu
0 siblings, 0 replies; 62+ messages in thread
From: Li-Wen Hsu @ 2019-04-30 21:54 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz, Alex Bennée,
Wainer dos Santos Moschetta, Markus Armbruster
On Mon, Apr 29, 2019 at 12:55 AM Thomas Huth <thuth@redhat.com> wrote:
>
> We are going to enable the qemu-iotests during "make check" again,
> and for running the iotests, we need bash and gnu-sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Li-Wen Hsu <lwhsu@freebsd.org>
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
@ 2019-05-01 11:09 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 11:09 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> We are going to enable the qemu-iotests during "make check" again,
> and for running the iotests, we need bash and gnu-sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> .cirrus.yml | 4 ++--
> .travis.yml | 1 +
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 47ef5bc604..8326a3a4b1 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -7,7 +7,7 @@ freebsd_12_task:
> cpu: 8
> memory: 8G
> install_script: pkg install -y
> - bison curl cyrus-sasl git glib gmake gnutls
> + bash bison curl cyrus-sasl git glib gmake gnutls gsed
> nettle perl5 pixman pkgconf png usbredir
> script:
> - mkdir build
> @@ -20,7 +20,7 @@ macos_task:
> osx_instance:
> image: mojave-base
> install_script:
> - - brew install pkg-config python glib pixman make sdl2
> + - brew install pkg-config python gnu-sed glib pixman make sdl2
> script:
> - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
> - gmake -j$(sysctl -n hw.ncpu)
> diff --git a/.travis.yml b/.travis.yml
> index 2e06aee9d0..ba94644192 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -42,6 +42,7 @@ addons:
> packages:
> - glib
> - pixman
> + - gnu-sed
>
>
> # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
@ 2019-05-01 11:09 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 11:09 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> We are going to enable the qemu-iotests during "make check" again,
> and for running the iotests, we need bash and gnu-sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> .cirrus.yml | 4 ++--
> .travis.yml | 1 +
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 47ef5bc604..8326a3a4b1 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -7,7 +7,7 @@ freebsd_12_task:
> cpu: 8
> memory: 8G
> install_script: pkg install -y
> - bison curl cyrus-sasl git glib gmake gnutls
> + bash bison curl cyrus-sasl git glib gmake gnutls gsed
> nettle perl5 pixman pkgconf png usbredir
> script:
> - mkdir build
> @@ -20,7 +20,7 @@ macos_task:
> osx_instance:
> image: mojave-base
> install_script:
> - - brew install pkg-config python glib pixman make sdl2
> + - brew install pkg-config python gnu-sed glib pixman make sdl2
> script:
> - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
> - gmake -j$(sysctl -n hw.ncpu)
> diff --git a/.travis.yml b/.travis.yml
> index 2e06aee9d0..ba94644192 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -42,6 +42,7 @@ addons:
> packages:
> - glib
> - pixman
> + - gnu-sed
>
>
> # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
@ 2019-05-01 15:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 62+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-01 15:19 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Wainer dos Santos Moschetta,
Markus Armbruster, Alex Bennée
On 4/28/19 5:54 PM, Thomas Huth wrote:
> We are going to enable the qemu-iotests during "make check" again,
> and for running the iotests, we need bash and gnu-sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> .cirrus.yml | 4 ++--
> .travis.yml | 1 +
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 47ef5bc604..8326a3a4b1 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -7,7 +7,7 @@ freebsd_12_task:
> cpu: 8
> memory: 8G
> install_script: pkg install -y
> - bison curl cyrus-sasl git glib gmake gnutls
> + bash bison curl cyrus-sasl git glib gmake gnutls gsed
> nettle perl5 pixman pkgconf png usbredir
> script:
> - mkdir build
> @@ -20,7 +20,7 @@ macos_task:
> osx_instance:
> image: mojave-base
> install_script:
> - - brew install pkg-config python glib pixman make sdl2
> + - brew install pkg-config python gnu-sed glib pixman make sdl2
> script:
> - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
> - gmake -j$(sysctl -n hw.ncpu)
> diff --git a/.travis.yml b/.travis.yml
> index 2e06aee9d0..ba94644192 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -42,6 +42,7 @@ addons:
> packages:
> - glib
> - pixman
> + - gnu-sed
>
>
> # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
>
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 5/8] cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
@ 2019-05-01 15:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 62+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-01 15:19 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block, Alex Bennée,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu
On 4/28/19 5:54 PM, Thomas Huth wrote:
> We are going to enable the qemu-iotests during "make check" again,
> and for running the iotests, we need bash and gnu-sed.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> .cirrus.yml | 4 ++--
> .travis.yml | 1 +
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/.cirrus.yml b/.cirrus.yml
> index 47ef5bc604..8326a3a4b1 100644
> --- a/.cirrus.yml
> +++ b/.cirrus.yml
> @@ -7,7 +7,7 @@ freebsd_12_task:
> cpu: 8
> memory: 8G
> install_script: pkg install -y
> - bison curl cyrus-sasl git glib gmake gnutls
> + bash bison curl cyrus-sasl git glib gmake gnutls gsed
> nettle perl5 pixman pkgconf png usbredir
> script:
> - mkdir build
> @@ -20,7 +20,7 @@ macos_task:
> osx_instance:
> image: mojave-base
> install_script:
> - - brew install pkg-config python glib pixman make sdl2
> + - brew install pkg-config python gnu-sed glib pixman make sdl2
> script:
> - ./configure --python=/usr/local/bin/python3 || { cat config.log; exit 1; }
> - gmake -j$(sysctl -n hw.ncpu)
> diff --git a/.travis.yml b/.travis.yml
> index 2e06aee9d0..ba94644192 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -42,6 +42,7 @@ addons:
> packages:
> - glib
> - pixman
> + - gnu-sed
>
>
> # The channel name "irc.oftc.net#qemu" is encrypted against qemu/qemu
>
^ permalink raw reply [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 6/8] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
A lot of tests run fine on FreeBSD and macOS, too - the limitation
to Linux here was likely just copied-and-pasted from other tests.
Thus remove the "_supported_os Linux" line from tests that run
successful in our CI pipelines on FreeBSD and macOS.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/001 | 1 -
tests/qemu-iotests/002 | 1 -
tests/qemu-iotests/003 | 1 -
tests/qemu-iotests/004 | 1 -
tests/qemu-iotests/007 | 1 -
tests/qemu-iotests/008 | 1 -
tests/qemu-iotests/009 | 1 -
tests/qemu-iotests/010 | 1 -
tests/qemu-iotests/011 | 1 -
tests/qemu-iotests/012 | 1 -
tests/qemu-iotests/015 | 1 -
tests/qemu-iotests/017 | 1 -
tests/qemu-iotests/020 | 1 -
tests/qemu-iotests/021 | 1 -
tests/qemu-iotests/022 | 1 -
tests/qemu-iotests/025 | 1 -
tests/qemu-iotests/026 | 1 -
tests/qemu-iotests/027 | 1 -
tests/qemu-iotests/029 | 1 -
tests/qemu-iotests/031 | 1 -
tests/qemu-iotests/032 | 1 -
tests/qemu-iotests/033 | 1 -
tests/qemu-iotests/035 | 1 -
tests/qemu-iotests/036 | 1 -
tests/qemu-iotests/037 | 1 -
tests/qemu-iotests/042 | 1 -
tests/qemu-iotests/043 | 1 -
tests/qemu-iotests/046 | 1 -
tests/qemu-iotests/047 | 1 -
tests/qemu-iotests/049 | 1 -
tests/qemu-iotests/050 | 1 -
tests/qemu-iotests/051 | 1 -
tests/qemu-iotests/052 | 1 -
tests/qemu-iotests/053 | 1 -
tests/qemu-iotests/054 | 1 -
tests/qemu-iotests/062 | 1 -
tests/qemu-iotests/063 | 1 -
tests/qemu-iotests/066 | 1 -
tests/qemu-iotests/067 | 1 -
tests/qemu-iotests/068 | 1 -
tests/qemu-iotests/069 | 1 -
tests/qemu-iotests/071 | 1 -
tests/qemu-iotests/072 | 1 -
tests/qemu-iotests/073 | 1 -
tests/qemu-iotests/079 | 1 -
tests/qemu-iotests/082 | 1 -
tests/qemu-iotests/085 | 1 -
tests/qemu-iotests/089 | 1 -
tests/qemu-iotests/090 | 1 -
tests/qemu-iotests/094 | 1 -
tests/qemu-iotests/095 | 1 -
tests/qemu-iotests/098 | 1 -
tests/qemu-iotests/102 | 1 -
tests/qemu-iotests/103 | 1 -
tests/qemu-iotests/104 | 1 -
tests/qemu-iotests/105 | 1 -
tests/qemu-iotests/107 | 1 -
tests/qemu-iotests/110 | 1 -
tests/qemu-iotests/111 | 1 -
tests/qemu-iotests/112 | 1 -
tests/qemu-iotests/114 | 1 -
tests/qemu-iotests/115 | 1 -
tests/qemu-iotests/117 | 1 -
tests/qemu-iotests/120 | 1 -
tests/qemu-iotests/125 | 1 -
tests/qemu-iotests/126 | 1 -
tests/qemu-iotests/127 | 1 -
tests/qemu-iotests/133 | 1 -
tests/qemu-iotests/134 | 1 -
tests/qemu-iotests/142 | 1 -
tests/qemu-iotests/143 | 1 -
tests/qemu-iotests/144 | 1 -
tests/qemu-iotests/145 | 1 -
tests/qemu-iotests/153 | 1 -
tests/qemu-iotests/156 | 1 -
tests/qemu-iotests/157 | 1 -
tests/qemu-iotests/158 | 1 -
tests/qemu-iotests/159 | 1 -
tests/qemu-iotests/162 | 1 -
tests/qemu-iotests/170 | 1 -
tests/qemu-iotests/173 | 1 -
tests/qemu-iotests/182 | 1 -
tests/qemu-iotests/183 | 1 -
tests/qemu-iotests/186 | 1 -
tests/qemu-iotests/187 | 1 -
tests/qemu-iotests/190 | 1 -
tests/qemu-iotests/191 | 1 -
tests/qemu-iotests/192 | 1 -
tests/qemu-iotests/195 | 1 -
tests/qemu-iotests/197 | 1 -
tests/qemu-iotests/200 | 1 -
tests/qemu-iotests/214 | 1 -
tests/qemu-iotests/215 | 1 -
tests/qemu-iotests/217 | 1 -
tests/qemu-iotests/227 | 1 -
tests/qemu-iotests/231 | 1 -
tests/qemu-iotests/233 | 1 -
tests/qemu-iotests/240 | 1 -
tests/qemu-iotests/247 | 1 -
99 files changed, 99 deletions(-)
diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
index 5d266e170a..d87a535c33 100755
--- a/tests/qemu-iotests/001
+++ b/tests/qemu-iotests/001
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index 7fb85084a1..fd413bce48 100755
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index f008c57cdc..ccd3a39dfb 100755
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
offset=67M
diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
index 64fab3e714..d308dc4b49 100755
--- a/tests/qemu-iotests/004
+++ b/tests/qemu-iotests/004
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 3ab5490db3..6abd402423 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# currently only qcow2 allows for consistency checks using qemu-img
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
# 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]'
diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
index 75067e36ad..2b81b119bf 100755
--- a/tests/qemu-iotests/008
+++ b/tests/qemu-iotests/008
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index bc4b461122..51b200db1d 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=6G
diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index 6920408d28..48c533f632 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=6G
diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index b4c7e8f799..8b1fce069a 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=6G
diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
index 2c3b42d9dd..12957285b3 100755
--- a/tests/qemu-iotests/012
+++ b/tests/qemu-iotests/012
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
# Remove once all tests are fixed to use TEST_IMG_FILE
# correctly and common.rc sets it unconditionally
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index 5a4063e4f5..eec5387f3d 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# actually any format that supports snapshots
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
# Internal snapshots are (currently) impossible with refcount_bits=1
_unsupported_imgopts 'refcount_bits=1[^0-9]'
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 83744f29a3..79875de454 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2 vmdk qed
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
TEST_OFFSETS="0 4294967296"
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 71fa753b4e..6b0ebb37d2 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files
_supported_fmt qcow qcow2 vmdk qed
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \
"subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021
index f6555f3b74..f888269fd4 100755
--- a/tests/qemu-iotests/021
+++ b/tests/qemu-iotests/021
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
index b68cd64b33..99eb08f57f 100755
--- a/tests/qemu-iotests/022
+++ b/tests/qemu-iotests/022
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format that supports snapshots
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
TEST_OFFSETS="10485760 4294967296"
CLUSTER_SIZE="4096"
diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
index d9a4ebc5e7..e05d833452 100755
--- a/tests/qemu-iotests/025
+++ b/tests/qemu-iotests/025
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt raw qcow2 qed luks
_supported_proto file sheepdog rbd nfs
-_supported_os Linux
echo "=== Creating image"
echo
diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index ca89ad7048..e30243608b 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Currently only qcow2 supports rebasing
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
_default_cache_mode "writethrough"
_supported_cache_modes "writethrough" "none"
# The refcount table tests expect a certain minimum width for refcount entries
diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
index b7df9701f7..4cb638022a 100755
--- a/tests/qemu-iotests/027
+++ b/tests/qemu-iotests/027
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt vmdk qcow qcow2 qed
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index 5f42f76cc6..94c2713132 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
# Internal snapshots are (currently) impossible with refcount_bits=1
_unsupported_imgopts 'refcount_bits=1[^0-9]'
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index ef92d8eee3..a3c25ec237 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
CLUSTER_SIZE=65536
diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
index a1757bb15e..23c216c549 100755
--- a/tests/qemu-iotests/032
+++ b/tests/qemu-iotests/032
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This works for any image format (though unlikely to segfault for raw)
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
echo
echo === Prepare image ===
diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
index cfdf1ec2ba..362a48c0a0 100755
--- a/tests/qemu-iotests/033
+++ b/tests/qemu-iotests/033
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
index 46aa835936..ad6fa3115a 100755
--- a/tests/qemu-iotests/035
+++ b/tests/qemu-iotests/035
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
size=6G
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index 1b56394129..f06ff67408 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# Only qcow2v3 and later supports feature bits
IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
index 0781bebefe..819a2a52d2 100755
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2 vmdk qed
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \
"subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
index a9a7fc3041..0e85b356b7 100755
--- a/tests/qemu-iotests/042
+++ b/tests/qemu-iotests/042
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
echo
echo "== Creating zero size image =="
diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index 9894b154ec..67cc7e74c2 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 95160bea4c..543355c64f 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
CLUSTER_SIZE=64k
size=128M
diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047
index ce81fc6fa7..4528465fb0 100755
--- a/tests/qemu-iotests/047
+++ b/tests/qemu-iotests/047
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
index bc09cd6717..c100d30ed0 100755
--- a/tests/qemu-iotests/049
+++ b/tests/qemu-iotests/049
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
filter_test_dir()
{
diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index dd7b2c72eb..211fc00797 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
IMGOPTS=compat=1.1
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 02ac960da4..a3deb1fcad 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# 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]\|$\)\)'
diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
index b3a2dc1143..6e2ecbfe21 100755
--- a/tests/qemu-iotests/052
+++ b/tests/qemu-iotests/052
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
# Don't do O_DIRECT on tmpfs
_supported_cache_modes "writeback" "writethrough" "unsafe"
diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
index 50c62f0f56..e82bb69881 100755
--- a/tests/qemu-iotests/053
+++ b/tests/qemu-iotests/053
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qcow
_supported_proto file
-_supported_os Linux
echo
echo "== Creating single sector image =="
diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
index 0d5e14f847..a8905b60d0 100755
--- a/tests/qemu-iotests/054
+++ b/tests/qemu-iotests/054
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
echo
echo "creating too large image (1 EB)"
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index ed7400fed2..d5f818fcce 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
IMGOPTS="compat=1.1"
IMG_SIZE=64M
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index 2d5c0ce9fb..fe4892e467 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2 vmdk qed raw
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \
"subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index f480986e35..28f8c98412 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
# Intentionally create an unaligned image
IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index fda16a6b0d..926c79b37c 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -32,7 +32,6 @@ status=1 # failure is the default!
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# Because anything other than 16 would change the output of query-block
_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index 881a022107..22f5ca3ba6 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
IMGOPTS="compat=1.1"
IMG_SIZE=128K
diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index 6a8e4aa22e..3974714852 100755
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qed qcow qcow2 vmdk
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
IMG_SIZE=128K
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index 7f3e5abd57..1cca9233d0 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
index 6f9f247fa5..661b36da2d 100755
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
_supported_proto file
-_supported_os Linux
IMG_SIZE=64M
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index 990f90acbd..e684b1b780 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
CLUSTER_SIZE=64k
size=128M
diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 1b6594ebef..81f0c21f53 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
echo "=== Check option preallocation and cluster_size ==="
echo
diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
index d0afa46e9a..d084a0844d 100755
--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
run_qemu_img()
{
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index 68cb665987..d40fdab542 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -56,7 +56,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# ${1}: unique identifier for the snapshot filename
diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
index 6609954908..ad029f1f09 100755
--- a/tests/qemu-iotests/089
+++ b/tests/qemu-iotests/089
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# Because anything other than 16 would change the output of qemu_io -c info
_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index 193bae7d77..9f8cfbb80f 100755
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
IMG_SIZE=128K
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index 0bcca77261..9343e09492 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto nbd
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
_make_test_img 64M
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index 18505b7181..58fe174b5e 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size_smaller=5M
size_larger=100M
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index 461144c831..1c1d1c468f 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index cedd2b25dc..749ff66b8a 100755
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
IMG_SIZE=64K
diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index 6773e94d9f..554b9de054 100755
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
# Internal snapshots are (currently) impossible with refcount_bits=1
_unsupported_imgopts 'refcount_bits=1[^0-9]'
diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104
index 390167bad4..c70f28a9a1 100755
--- a/tests/qemu-iotests/104
+++ b/tests/qemu-iotests/104
@@ -34,7 +34,6 @@ trap "exit \$status" 0 1 2 3 15
_supported_fmt raw qcow qcow2 qed vdi vmdk vhdx
_supported_proto generic
-_supported_os Linux
echo "=== Check qemu-img info output ==="
echo
diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
index 3b5a596844..3346e8cb25 100755
--- a/tests/qemu-iotests/105
+++ b/tests/qemu-iotests/105
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 vmdk vhdx qed
_supported_proto generic
-_supported_os Linux
_unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
"subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107
index fcd5a24dfe..268ba27688 100755
--- a/tests/qemu-iotests/107
+++ b/tests/qemu-iotests/107
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
IMG_SIZE=64K
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index fad672c1ae..4318341ac5 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files
_supported_fmt qed qcow qcow2 vmdk
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
TEST_IMG_REL=$(basename "$TEST_IMG")
diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index 57395be64c..490a5bbcb5 100755
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qed qcow qcow2 vmdk
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 6d81c75a9c..706c10b600 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# 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'
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index f36b88f3f3..f90a744fc0 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index 7ed347010f..9ed3cb6a83 100755
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# This test relies on refcounts being 64 bits wide (which does not work with
# compat=0.10)
_unsupported_imgopts 'refcount_bits=\([^6]\|.\([^4]\|$\)\)' 'compat=0.10'
diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index 0af0f31c5a..f37b34f8b1 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
_make_test_img 64k
diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
index ca95b9276e..e9b4fbb009 100755
--- a/tests/qemu-iotests/120
+++ b/tests/qemu-iotests/120
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
_unsupported_fmt luks
_make_test_img 64M
diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index 212dcd8f0d..dc4b8f5fb9 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -44,7 +44,6 @@ get_image_size_on_host()
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
if [ -z "$TEST_IMG_FILE" ]; then
TEST_IMG_FILE=$TEST_IMG
diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
index 96dc048d59..580fae5d62 100755
--- a/tests/qemu-iotests/126
+++ b/tests/qemu-iotests/126
@@ -37,7 +37,6 @@ _supported_fmt qcow qcow2 qed vmdk
# colons which separate a protocol prefix from the rest and colons which are
# just part of the filename, so we cannot test protocols which require a prefix)
_supported_proto file
-_supported_os Linux
echo
echo '=== Testing plain files ==='
diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
index 3e941f74d4..b64926ab31 100755
--- a/tests/qemu-iotests/127
+++ b/tests/qemu-iotests/127
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
IMG_SIZE=64K
diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
index 1f6056d144..6f7cacc091 100755
--- a/tests/qemu-iotests/133
+++ b/tests/qemu-iotests/133
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
TEST_IMG="$TEST_IMG.base" _make_test_img 64M
_make_test_img -b "$TEST_IMG.base"
diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
index e9e3e84c2a..141a2eaa7e 100755
--- a/tests/qemu-iotests/134
+++ b/tests/qemu-iotests/134
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
index d9b98cf60a..6b62271876 100755
--- a/tests/qemu-iotests/142
+++ b/tests/qemu-iotests/142
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# We test all cache modes anyway, but O_DIRECT needs to be supported
_default_cache_mode none
diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
index c223867cb3..92249ac8da 100755
--- a/tests/qemu-iotests/143
+++ b/tests/qemu-iotests/143
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
keep_stderr=y \
_launch_qemu 2> >(_filter_nbd)
diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
index 15157f33d7..011ed4f2bc 100755
--- a/tests/qemu-iotests/144
+++ b/tests/qemu-iotests/144
@@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size=512M
diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145
index 28878dc8a1..9427549651 100755
--- a/tests/qemu-iotests/145
+++ b/tests/qemu-iotests/145
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
_make_test_img 1M
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index 08ad8a6730..c969a1a16f 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -62,7 +62,6 @@ _check_ofd || _notrun "OFD lock not available"
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
_run_cmd()
{
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index 8d134029c6..2ffa3ca942 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -49,7 +49,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
# Create source disk
TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157
index 69b25cab30..7cbac38099 100755
--- a/tests/qemu-iotests/157
+++ b/tests/qemu-iotests/157
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
index 8c0928a7f9..ba4db6116a 100755
--- a/tests/qemu-iotests/158
+++ b/tests/qemu-iotests/158
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
index 29066eebde..2557140ac2 100755
--- a/tests/qemu-iotests/159
+++ b/tests/qemu-iotests/159
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
_unsupported_fmt luks
TEST_SIZES="5 512 1024 1999 1K 64K 1M"
diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index 2e9947fd9a..4e5ed74fd5 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter
_supported_fmt generic
-_supported_os Linux
test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)')
[ "$test_ssh" = "" ] && _notrun "ssh support required"
diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
index 7deb7563c9..05dd6ed6c3 100755
--- a/tests/qemu-iotests/170
+++ b/tests/qemu-iotests/170
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
_unsupported_fmt luks
echo
diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index 47036a5564..9e2fa2e73c 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto nfs
-_supported_os Linux
size=100M
diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index ff3d7e7ec1..fd7627fb65 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size=32M
diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index 93b7bd798a..fbe5a99beb 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 raw qed quorum
_supported_proto file
-_supported_os Linux
size=64M
_make_test_img $size
diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index 5dd2177b89..7e7d45babc 100755
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
_notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index a45addde09..2fcef9e2bd 100755
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size=64M
_make_test_img $size
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index e1c1d407f0..eb766ad09f 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# See 178 for more extensive tests across more formats
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
echo "== Huge file =="
echo
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 1ea908ce3d..528022e8d8 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size=64M
diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 158086f9d2..84d1ed7cfa 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
_notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index bd1b71ae5e..ef7b9a94e2 100755
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 2c664793f4..383d7d7f61 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -51,7 +51,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Test is supported for any backing file; but we force qcow2 for our wrapper.
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
# LUKS support may be possible, but it complicates things.
_unsupported_fmt luks
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index 1c0f8cafc2..72d431f251 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
BACKING_IMG="${TEST_DIR}/backing.img"
TEST_IMG="${TEST_DIR}/test.img"
diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index c1a452ff9a..21ec8a2ad8 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# Repairing the corrupted image requires qemu-img check to store a
# refcount up to 3, which requires at least two refcount bits.
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index 7b063d7cfa..958c14f5a0 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -48,7 +48,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Test is supported for any backing file; but we force qcow2 for our wrapper.
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
# LUKS support may be possible, but it complicates things.
_unsupported_fmt luks
diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
index f5482bb669..58a78a6098 100755
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217
@@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This test is specific to qcow2
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# This test needs clusters with at least a refcount of 2 so that
# OFLAG_COPIED is not set. refcount_bits=1 is therefore unsupported.
diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227
index 10cf144eb0..bdd727a721 100755
--- a/tests/qemu-iotests/227
+++ b/tests/qemu-iotests/227
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
index 5b2cbab9ac..c0b053ac30 100755
--- a/tests/qemu-iotests/231
+++ b/tests/qemu-iotests/231
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto rbd
-_supported_os Linux
BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
touch "${BOGUS_CONF}"
diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
index b8b6c8cc4c..5855f94b9a 100755
--- a/tests/qemu-iotests/233
+++ b/tests/qemu-iotests/233
@@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt raw qcow2
_supported_proto file
# If porting to non-Linux, consider using socat instead of ss in common.nbd
-_supported_os Linux
_require_command QEMU_NBD
nbd_server_set_tcp_port
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index d3e663ed65..b4cf95096d 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -33,7 +33,6 @@ status=1 # failure is the default!
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index fc50eb5dc1..546a794d3d 100755
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Requires backing files and .bdrv_change_backing_file support
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
size=128M
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* [Qemu-devel] [PATCH v2 6/8] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
A lot of tests run fine on FreeBSD and macOS, too - the limitation
to Linux here was likely just copied-and-pasted from other tests.
Thus remove the "_supported_os Linux" line from tests that run
successful in our CI pipelines on FreeBSD and macOS.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/001 | 1 -
tests/qemu-iotests/002 | 1 -
tests/qemu-iotests/003 | 1 -
tests/qemu-iotests/004 | 1 -
tests/qemu-iotests/007 | 1 -
tests/qemu-iotests/008 | 1 -
tests/qemu-iotests/009 | 1 -
tests/qemu-iotests/010 | 1 -
tests/qemu-iotests/011 | 1 -
tests/qemu-iotests/012 | 1 -
tests/qemu-iotests/015 | 1 -
tests/qemu-iotests/017 | 1 -
tests/qemu-iotests/020 | 1 -
tests/qemu-iotests/021 | 1 -
tests/qemu-iotests/022 | 1 -
tests/qemu-iotests/025 | 1 -
tests/qemu-iotests/026 | 1 -
tests/qemu-iotests/027 | 1 -
tests/qemu-iotests/029 | 1 -
tests/qemu-iotests/031 | 1 -
tests/qemu-iotests/032 | 1 -
tests/qemu-iotests/033 | 1 -
tests/qemu-iotests/035 | 1 -
tests/qemu-iotests/036 | 1 -
tests/qemu-iotests/037 | 1 -
tests/qemu-iotests/042 | 1 -
tests/qemu-iotests/043 | 1 -
tests/qemu-iotests/046 | 1 -
tests/qemu-iotests/047 | 1 -
tests/qemu-iotests/049 | 1 -
tests/qemu-iotests/050 | 1 -
tests/qemu-iotests/051 | 1 -
tests/qemu-iotests/052 | 1 -
tests/qemu-iotests/053 | 1 -
tests/qemu-iotests/054 | 1 -
tests/qemu-iotests/062 | 1 -
tests/qemu-iotests/063 | 1 -
tests/qemu-iotests/066 | 1 -
tests/qemu-iotests/067 | 1 -
tests/qemu-iotests/068 | 1 -
tests/qemu-iotests/069 | 1 -
tests/qemu-iotests/071 | 1 -
tests/qemu-iotests/072 | 1 -
tests/qemu-iotests/073 | 1 -
tests/qemu-iotests/079 | 1 -
tests/qemu-iotests/082 | 1 -
tests/qemu-iotests/085 | 1 -
tests/qemu-iotests/089 | 1 -
tests/qemu-iotests/090 | 1 -
tests/qemu-iotests/094 | 1 -
tests/qemu-iotests/095 | 1 -
tests/qemu-iotests/098 | 1 -
tests/qemu-iotests/102 | 1 -
tests/qemu-iotests/103 | 1 -
tests/qemu-iotests/104 | 1 -
tests/qemu-iotests/105 | 1 -
tests/qemu-iotests/107 | 1 -
tests/qemu-iotests/110 | 1 -
tests/qemu-iotests/111 | 1 -
tests/qemu-iotests/112 | 1 -
tests/qemu-iotests/114 | 1 -
tests/qemu-iotests/115 | 1 -
tests/qemu-iotests/117 | 1 -
tests/qemu-iotests/120 | 1 -
tests/qemu-iotests/125 | 1 -
tests/qemu-iotests/126 | 1 -
tests/qemu-iotests/127 | 1 -
tests/qemu-iotests/133 | 1 -
tests/qemu-iotests/134 | 1 -
tests/qemu-iotests/142 | 1 -
tests/qemu-iotests/143 | 1 -
tests/qemu-iotests/144 | 1 -
tests/qemu-iotests/145 | 1 -
tests/qemu-iotests/153 | 1 -
tests/qemu-iotests/156 | 1 -
tests/qemu-iotests/157 | 1 -
tests/qemu-iotests/158 | 1 -
tests/qemu-iotests/159 | 1 -
tests/qemu-iotests/162 | 1 -
tests/qemu-iotests/170 | 1 -
tests/qemu-iotests/173 | 1 -
tests/qemu-iotests/182 | 1 -
tests/qemu-iotests/183 | 1 -
tests/qemu-iotests/186 | 1 -
tests/qemu-iotests/187 | 1 -
tests/qemu-iotests/190 | 1 -
tests/qemu-iotests/191 | 1 -
tests/qemu-iotests/192 | 1 -
tests/qemu-iotests/195 | 1 -
tests/qemu-iotests/197 | 1 -
tests/qemu-iotests/200 | 1 -
tests/qemu-iotests/214 | 1 -
tests/qemu-iotests/215 | 1 -
tests/qemu-iotests/217 | 1 -
tests/qemu-iotests/227 | 1 -
tests/qemu-iotests/231 | 1 -
tests/qemu-iotests/233 | 1 -
tests/qemu-iotests/240 | 1 -
tests/qemu-iotests/247 | 1 -
99 files changed, 99 deletions(-)
diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
index 5d266e170a..d87a535c33 100755
--- a/tests/qemu-iotests/001
+++ b/tests/qemu-iotests/001
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
index 7fb85084a1..fd413bce48 100755
--- a/tests/qemu-iotests/002
+++ b/tests/qemu-iotests/002
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
index f008c57cdc..ccd3a39dfb 100755
--- a/tests/qemu-iotests/003
+++ b/tests/qemu-iotests/003
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
offset=67M
diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
index 64fab3e714..d308dc4b49 100755
--- a/tests/qemu-iotests/004
+++ b/tests/qemu-iotests/004
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
index 3ab5490db3..6abd402423 100755
--- a/tests/qemu-iotests/007
+++ b/tests/qemu-iotests/007
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# currently only qcow2 allows for consistency checks using qemu-img
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
# 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]'
diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
index 75067e36ad..2b81b119bf 100755
--- a/tests/qemu-iotests/008
+++ b/tests/qemu-iotests/008
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
index bc4b461122..51b200db1d 100755
--- a/tests/qemu-iotests/009
+++ b/tests/qemu-iotests/009
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=6G
diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
index 6920408d28..48c533f632 100755
--- a/tests/qemu-iotests/010
+++ b/tests/qemu-iotests/010
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=6G
diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
index b4c7e8f799..8b1fce069a 100755
--- a/tests/qemu-iotests/011
+++ b/tests/qemu-iotests/011
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=6G
diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
index 2c3b42d9dd..12957285b3 100755
--- a/tests/qemu-iotests/012
+++ b/tests/qemu-iotests/012
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
# Remove once all tests are fixed to use TEST_IMG_FILE
# correctly and common.rc sets it unconditionally
diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
index 5a4063e4f5..eec5387f3d 100755
--- a/tests/qemu-iotests/015
+++ b/tests/qemu-iotests/015
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# actually any format that supports snapshots
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
# Internal snapshots are (currently) impossible with refcount_bits=1
_unsupported_imgopts 'refcount_bits=1[^0-9]'
diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index 83744f29a3..79875de454 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2 vmdk qed
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
TEST_OFFSETS="0 4294967296"
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index 71fa753b4e..6b0ebb37d2 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files
_supported_fmt qcow qcow2 vmdk qed
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \
"subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021
index f6555f3b74..f888269fd4 100755
--- a/tests/qemu-iotests/021
+++ b/tests/qemu-iotests/021
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
index b68cd64b33..99eb08f57f 100755
--- a/tests/qemu-iotests/022
+++ b/tests/qemu-iotests/022
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format that supports snapshots
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
TEST_OFFSETS="10485760 4294967296"
CLUSTER_SIZE="4096"
diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
index d9a4ebc5e7..e05d833452 100755
--- a/tests/qemu-iotests/025
+++ b/tests/qemu-iotests/025
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt raw qcow2 qed luks
_supported_proto file sheepdog rbd nfs
-_supported_os Linux
echo "=== Creating image"
echo
diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index ca89ad7048..e30243608b 100755
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Currently only qcow2 supports rebasing
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
_default_cache_mode "writethrough"
_supported_cache_modes "writethrough" "none"
# The refcount table tests expect a certain minimum width for refcount entries
diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
index b7df9701f7..4cb638022a 100755
--- a/tests/qemu-iotests/027
+++ b/tests/qemu-iotests/027
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt vmdk qcow qcow2 qed
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index 5f42f76cc6..94c2713132 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
# Internal snapshots are (currently) impossible with refcount_bits=1
_unsupported_imgopts 'refcount_bits=1[^0-9]'
diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index ef92d8eee3..a3c25ec237 100755
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
CLUSTER_SIZE=65536
diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
index a1757bb15e..23c216c549 100755
--- a/tests/qemu-iotests/032
+++ b/tests/qemu-iotests/032
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This works for any image format (though unlikely to segfault for raw)
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
echo
echo === Prepare image ===
diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
index cfdf1ec2ba..362a48c0a0 100755
--- a/tests/qemu-iotests/033
+++ b/tests/qemu-iotests/033
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
index 46aa835936..ad6fa3115a 100755
--- a/tests/qemu-iotests/035
+++ b/tests/qemu-iotests/035
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
size=6G
diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index 1b56394129..f06ff67408 100755
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# Only qcow2v3 and later supports feature bits
IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
index 0781bebefe..819a2a52d2 100755
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2 vmdk qed
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \
"subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
index a9a7fc3041..0e85b356b7 100755
--- a/tests/qemu-iotests/042
+++ b/tests/qemu-iotests/042
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
echo
echo "== Creating zero size image =="
diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index 9894b154ec..67cc7e74c2 100755
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 95160bea4c..543355c64f 100755
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
CLUSTER_SIZE=64k
size=128M
diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047
index ce81fc6fa7..4528465fb0 100755
--- a/tests/qemu-iotests/047
+++ b/tests/qemu-iotests/047
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
index bc09cd6717..c100d30ed0 100755
--- a/tests/qemu-iotests/049
+++ b/tests/qemu-iotests/049
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
filter_test_dir()
{
diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index dd7b2c72eb..211fc00797 100755
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
IMGOPTS=compat=1.1
diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
index 02ac960da4..a3deb1fcad 100755
--- a/tests/qemu-iotests/051
+++ b/tests/qemu-iotests/051
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# 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]\|$\)\)'
diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
index b3a2dc1143..6e2ecbfe21 100755
--- a/tests/qemu-iotests/052
+++ b/tests/qemu-iotests/052
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
# Don't do O_DIRECT on tmpfs
_supported_cache_modes "writeback" "writethrough" "unsafe"
diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
index 50c62f0f56..e82bb69881 100755
--- a/tests/qemu-iotests/053
+++ b/tests/qemu-iotests/053
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qcow
_supported_proto file
-_supported_os Linux
echo
echo "== Creating single sector image =="
diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
index 0d5e14f847..a8905b60d0 100755
--- a/tests/qemu-iotests/054
+++ b/tests/qemu-iotests/054
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
echo
echo "creating too large image (1 EB)"
diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
index ed7400fed2..d5f818fcce 100755
--- a/tests/qemu-iotests/062
+++ b/tests/qemu-iotests/062
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
IMGOPTS="compat=1.1"
IMG_SIZE=64M
diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index 2d5c0ce9fb..fe4892e467 100755
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2 vmdk qed raw
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" \
"subformat=twoGbMaxExtentFlat" \
"subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
index f480986e35..28f8c98412 100755
--- a/tests/qemu-iotests/066
+++ b/tests/qemu-iotests/066
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
# Intentionally create an unaligned image
IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index fda16a6b0d..926c79b37c 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -32,7 +32,6 @@ status=1 # failure is the default!
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# Because anything other than 16 would change the output of query-block
_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
index 881a022107..22f5ca3ba6 100755
--- a/tests/qemu-iotests/068
+++ b/tests/qemu-iotests/068
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qocw2-specific low-level functionality
_supported_fmt qcow2
_supported_proto generic
-_supported_os Linux
IMGOPTS="compat=1.1"
IMG_SIZE=128K
diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index 6a8e4aa22e..3974714852 100755
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qed qcow qcow2 vmdk
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
IMG_SIZE=128K
diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index 7f3e5abd57..1cca9233d0 100755
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
index 6f9f247fa5..661b36da2d 100755
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
_supported_proto file
-_supported_os Linux
IMG_SIZE=64M
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index 990f90acbd..e684b1b780 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
CLUSTER_SIZE=64k
size=128M
diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 1b6594ebef..81f0c21f53 100755
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
echo "=== Check option preallocation and cluster_size ==="
echo
diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
index d0afa46e9a..d084a0844d 100755
--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
run_qemu_img()
{
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
index 68cb665987..d40fdab542 100755
--- a/tests/qemu-iotests/085
+++ b/tests/qemu-iotests/085
@@ -56,7 +56,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# ${1}: unique identifier for the snapshot filename
diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
index 6609954908..ad029f1f09 100755
--- a/tests/qemu-iotests/089
+++ b/tests/qemu-iotests/089
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# Because anything other than 16 would change the output of qemu_io -c info
_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index 193bae7d77..9f8cfbb80f 100755
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
IMG_SIZE=128K
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index 0bcca77261..9343e09492 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto nbd
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
_make_test_img 64M
diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index 18505b7181..58fe174b5e 100755
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size_smaller=5M
size_larger=100M
diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index 461144c831..1c1d1c468f 100755
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
IMGOPTS="compat=1.1"
diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index cedd2b25dc..749ff66b8a 100755
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
IMG_SIZE=64K
diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index 6773e94d9f..554b9de054 100755
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
# Internal snapshots are (currently) impossible with refcount_bits=1
_unsupported_imgopts 'refcount_bits=1[^0-9]'
diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104
index 390167bad4..c70f28a9a1 100755
--- a/tests/qemu-iotests/104
+++ b/tests/qemu-iotests/104
@@ -34,7 +34,6 @@ trap "exit \$status" 0 1 2 3 15
_supported_fmt raw qcow qcow2 qed vdi vmdk vhdx
_supported_proto generic
-_supported_os Linux
echo "=== Check qemu-img info output ==="
echo
diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
index 3b5a596844..3346e8cb25 100755
--- a/tests/qemu-iotests/105
+++ b/tests/qemu-iotests/105
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 vmdk vhdx qed
_supported_proto generic
-_supported_os Linux
_unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
"subformat=twoGbMaxExtentSparse"
diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107
index fcd5a24dfe..268ba27688 100755
--- a/tests/qemu-iotests/107
+++ b/tests/qemu-iotests/107
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file nfs
-_supported_os Linux
IMG_SIZE=64K
diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index fad672c1ae..4318341ac5 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Any format supporting backing files
_supported_fmt qed qcow qcow2 vmdk
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
TEST_IMG_REL=$(basename "$TEST_IMG")
diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index 57395be64c..490a5bbcb5 100755
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qed qcow qcow2 vmdk
_supported_proto file
-_supported_os Linux
_unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
$QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 6d81c75a9c..706c10b600 100755
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This tests qcow2-specific low-level functionality
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# 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'
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index f36b88f3f3..f90a744fc0 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
TEST_IMG="$TEST_IMG.base" _make_test_img 64M
diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index 7ed347010f..9ed3cb6a83 100755
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# This test relies on refcounts being 64 bits wide (which does not work with
# compat=0.10)
_unsupported_imgopts 'refcount_bits=\([^6]\|.\([^4]\|$\)\)' 'compat=0.10'
diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index 0af0f31c5a..f37b34f8b1 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
_make_test_img 64k
diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
index ca95b9276e..e9b4fbb009 100755
--- a/tests/qemu-iotests/120
+++ b/tests/qemu-iotests/120
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
_unsupported_fmt luks
_make_test_img 64M
diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
index 212dcd8f0d..dc4b8f5fb9 100755
--- a/tests/qemu-iotests/125
+++ b/tests/qemu-iotests/125
@@ -44,7 +44,6 @@ get_image_size_on_host()
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
if [ -z "$TEST_IMG_FILE" ]; then
TEST_IMG_FILE=$TEST_IMG
diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
index 96dc048d59..580fae5d62 100755
--- a/tests/qemu-iotests/126
+++ b/tests/qemu-iotests/126
@@ -37,7 +37,6 @@ _supported_fmt qcow qcow2 qed vmdk
# colons which separate a protocol prefix from the rest and colons which are
# just part of the filename, so we cannot test protocols which require a prefix)
_supported_proto file
-_supported_os Linux
echo
echo '=== Testing plain files ==='
diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
index 3e941f74d4..b64926ab31 100755
--- a/tests/qemu-iotests/127
+++ b/tests/qemu-iotests/127
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
IMG_SIZE=64K
diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
index 1f6056d144..6f7cacc091 100755
--- a/tests/qemu-iotests/133
+++ b/tests/qemu-iotests/133
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
TEST_IMG="$TEST_IMG.base" _make_test_img 64M
_make_test_img -b "$TEST_IMG.base"
diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
index e9e3e84c2a..141a2eaa7e 100755
--- a/tests/qemu-iotests/134
+++ b/tests/qemu-iotests/134
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
index d9b98cf60a..6b62271876 100755
--- a/tests/qemu-iotests/142
+++ b/tests/qemu-iotests/142
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# We test all cache modes anyway, but O_DIRECT needs to be supported
_default_cache_mode none
diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
index c223867cb3..92249ac8da 100755
--- a/tests/qemu-iotests/143
+++ b/tests/qemu-iotests/143
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
keep_stderr=y \
_launch_qemu 2> >(_filter_nbd)
diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
index 15157f33d7..011ed4f2bc 100755
--- a/tests/qemu-iotests/144
+++ b/tests/qemu-iotests/144
@@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size=512M
diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145
index 28878dc8a1..9427549651 100755
--- a/tests/qemu-iotests/145
+++ b/tests/qemu-iotests/145
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
_make_test_img 1M
diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
index 08ad8a6730..c969a1a16f 100755
--- a/tests/qemu-iotests/153
+++ b/tests/qemu-iotests/153
@@ -62,7 +62,6 @@ _check_ofd || _notrun "OFD lock not available"
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
_run_cmd()
{
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index 8d134029c6..2ffa3ca942 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -49,7 +49,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
# Create source disk
TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157
index 69b25cab30..7cbac38099 100755
--- a/tests/qemu-iotests/157
+++ b/tests/qemu-iotests/157
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
index 8c0928a7f9..ba4db6116a 100755
--- a/tests/qemu-iotests/158
+++ b/tests/qemu-iotests/158
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow qcow2
_supported_proto generic
_unsupported_proto vxhs
-_supported_os Linux
size=128M
diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
index 29066eebde..2557140ac2 100755
--- a/tests/qemu-iotests/159
+++ b/tests/qemu-iotests/159
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
_unsupported_fmt luks
TEST_SIZES="5 512 1024 1999 1K 64K 1M"
diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index 2e9947fd9a..4e5ed74fd5 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter
_supported_fmt generic
-_supported_os Linux
test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)')
[ "$test_ssh" = "" ] && _notrun "ssh support required"
diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
index 7deb7563c9..05dd6ed6c3 100755
--- a/tests/qemu-iotests/170
+++ b/tests/qemu-iotests/170
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
_unsupported_fmt luks
echo
diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index 47036a5564..9e2fa2e73c 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto nfs
-_supported_os Linux
size=100M
diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
index ff3d7e7ec1..fd7627fb65 100755
--- a/tests/qemu-iotests/182
+++ b/tests/qemu-iotests/182
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size=32M
diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index 93b7bd798a..fbe5a99beb 100755
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 raw qed quorum
_supported_proto file
-_supported_os Linux
size=64M
_make_test_img $size
diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index 5dd2177b89..7e7d45babc 100755
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
_notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index a45addde09..2fcef9e2bd 100755
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size=64M
_make_test_img $size
diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
index e1c1d407f0..eb766ad09f 100755
--- a/tests/qemu-iotests/190
+++ b/tests/qemu-iotests/190
@@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# See 178 for more extensive tests across more formats
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
echo "== Huge file =="
echo
diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index 1ea908ce3d..528022e8d8 100755
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
size=64M
diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 158086f9d2..84d1ed7cfa 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
_notrun "Requires a PC machine"
diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index bd1b71ae5e..ef7b9a94e2 100755
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195
@@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
index 2c664793f4..383d7d7f61 100755
--- a/tests/qemu-iotests/197
+++ b/tests/qemu-iotests/197
@@ -51,7 +51,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Test is supported for any backing file; but we force qcow2 for our wrapper.
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
# LUKS support may be possible, but it complicates things.
_unsupported_fmt luks
diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index 1c0f8cafc2..72d431f251 100755
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
BACKING_IMG="${TEST_DIR}/backing.img"
TEST_IMG="${TEST_DIR}/test.img"
diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index c1a452ff9a..21ec8a2ad8 100755
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# Repairing the corrupted image requires qemu-img check to store a
# refcount up to 3, which requires at least two refcount bits.
diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
index 7b063d7cfa..958c14f5a0 100755
--- a/tests/qemu-iotests/215
+++ b/tests/qemu-iotests/215
@@ -48,7 +48,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Test is supported for any backing file; but we force qcow2 for our wrapper.
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
# LUKS support may be possible, but it complicates things.
_unsupported_fmt luks
diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
index f5482bb669..58a78a6098 100755
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217
@@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# This test is specific to qcow2
_supported_fmt qcow2
_supported_proto file
-_supported_os Linux
# This test needs clusters with at least a refcount of 2 so that
# OFLAG_COPIED is not set. refcount_bits=1 is therefore unsupported.
diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227
index 10cf144eb0..bdd727a721 100755
--- a/tests/qemu-iotests/227
+++ b/tests/qemu-iotests/227
@@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto file
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
index 5b2cbab9ac..c0b053ac30 100755
--- a/tests/qemu-iotests/231
+++ b/tests/qemu-iotests/231
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt generic
_supported_proto rbd
-_supported_os Linux
BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
touch "${BOGUS_CONF}"
diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
index b8b6c8cc4c..5855f94b9a 100755
--- a/tests/qemu-iotests/233
+++ b/tests/qemu-iotests/233
@@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_supported_fmt raw qcow2
_supported_proto file
# If porting to non-Linux, consider using socat instead of ss in common.nbd
-_supported_os Linux
_require_command QEMU_NBD
nbd_server_set_tcp_port
diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index d3e663ed65..b4cf95096d 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -33,7 +33,6 @@ status=1 # failure is the default!
_supported_fmt generic
_supported_proto generic
-_supported_os Linux
do_run_qemu()
{
diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index fc50eb5dc1..546a794d3d 100755
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247
@@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
# Requires backing files and .bdrv_change_backing_file support
_supported_fmt qcow2 qed
_supported_proto file
-_supported_os Linux
size=128M
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 6/8] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests
@ 2019-05-01 11:10 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 11:10 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> A lot of tests run fine on FreeBSD and macOS, too - the limitation
> to Linux here was likely just copied-and-pasted from other tests.
> Thus remove the "_supported_os Linux" line from tests that run
> successful in our CI pipelines on FreeBSD and macOS.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/qemu-iotests/001 | 1 -
> tests/qemu-iotests/002 | 1 -
> tests/qemu-iotests/003 | 1 -
> tests/qemu-iotests/004 | 1 -
> tests/qemu-iotests/007 | 1 -
> tests/qemu-iotests/008 | 1 -
> tests/qemu-iotests/009 | 1 -
> tests/qemu-iotests/010 | 1 -
> tests/qemu-iotests/011 | 1 -
> tests/qemu-iotests/012 | 1 -
> tests/qemu-iotests/015 | 1 -
> tests/qemu-iotests/017 | 1 -
> tests/qemu-iotests/020 | 1 -
> tests/qemu-iotests/021 | 1 -
> tests/qemu-iotests/022 | 1 -
> tests/qemu-iotests/025 | 1 -
> tests/qemu-iotests/026 | 1 -
> tests/qemu-iotests/027 | 1 -
> tests/qemu-iotests/029 | 1 -
> tests/qemu-iotests/031 | 1 -
> tests/qemu-iotests/032 | 1 -
> tests/qemu-iotests/033 | 1 -
> tests/qemu-iotests/035 | 1 -
> tests/qemu-iotests/036 | 1 -
> tests/qemu-iotests/037 | 1 -
> tests/qemu-iotests/042 | 1 -
> tests/qemu-iotests/043 | 1 -
> tests/qemu-iotests/046 | 1 -
> tests/qemu-iotests/047 | 1 -
> tests/qemu-iotests/049 | 1 -
> tests/qemu-iotests/050 | 1 -
> tests/qemu-iotests/051 | 1 -
> tests/qemu-iotests/052 | 1 -
> tests/qemu-iotests/053 | 1 -
> tests/qemu-iotests/054 | 1 -
> tests/qemu-iotests/062 | 1 -
> tests/qemu-iotests/063 | 1 -
> tests/qemu-iotests/066 | 1 -
> tests/qemu-iotests/067 | 1 -
> tests/qemu-iotests/068 | 1 -
> tests/qemu-iotests/069 | 1 -
> tests/qemu-iotests/071 | 1 -
> tests/qemu-iotests/072 | 1 -
> tests/qemu-iotests/073 | 1 -
> tests/qemu-iotests/079 | 1 -
> tests/qemu-iotests/082 | 1 -
> tests/qemu-iotests/085 | 1 -
> tests/qemu-iotests/089 | 1 -
> tests/qemu-iotests/090 | 1 -
> tests/qemu-iotests/094 | 1 -
> tests/qemu-iotests/095 | 1 -
> tests/qemu-iotests/098 | 1 -
> tests/qemu-iotests/102 | 1 -
> tests/qemu-iotests/103 | 1 -
> tests/qemu-iotests/104 | 1 -
> tests/qemu-iotests/105 | 1 -
> tests/qemu-iotests/107 | 1 -
> tests/qemu-iotests/110 | 1 -
> tests/qemu-iotests/111 | 1 -
> tests/qemu-iotests/112 | 1 -
> tests/qemu-iotests/114 | 1 -
> tests/qemu-iotests/115 | 1 -
> tests/qemu-iotests/117 | 1 -
> tests/qemu-iotests/120 | 1 -
> tests/qemu-iotests/125 | 1 -
> tests/qemu-iotests/126 | 1 -
> tests/qemu-iotests/127 | 1 -
> tests/qemu-iotests/133 | 1 -
> tests/qemu-iotests/134 | 1 -
> tests/qemu-iotests/142 | 1 -
> tests/qemu-iotests/143 | 1 -
> tests/qemu-iotests/144 | 1 -
> tests/qemu-iotests/145 | 1 -
> tests/qemu-iotests/153 | 1 -
> tests/qemu-iotests/156 | 1 -
> tests/qemu-iotests/157 | 1 -
> tests/qemu-iotests/158 | 1 -
> tests/qemu-iotests/159 | 1 -
> tests/qemu-iotests/162 | 1 -
> tests/qemu-iotests/170 | 1 -
> tests/qemu-iotests/173 | 1 -
> tests/qemu-iotests/182 | 1 -
> tests/qemu-iotests/183 | 1 -
> tests/qemu-iotests/186 | 1 -
> tests/qemu-iotests/187 | 1 -
> tests/qemu-iotests/190 | 1 -
> tests/qemu-iotests/191 | 1 -
> tests/qemu-iotests/192 | 1 -
> tests/qemu-iotests/195 | 1 -
> tests/qemu-iotests/197 | 1 -
> tests/qemu-iotests/200 | 1 -
> tests/qemu-iotests/214 | 1 -
> tests/qemu-iotests/215 | 1 -
> tests/qemu-iotests/217 | 1 -
> tests/qemu-iotests/227 | 1 -
> tests/qemu-iotests/231 | 1 -
> tests/qemu-iotests/233 | 1 -
> tests/qemu-iotests/240 | 1 -
> tests/qemu-iotests/247 | 1 -
> 99 files changed, 99 deletions(-)
>
> diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
> index 5d266e170a..d87a535c33 100755
> --- a/tests/qemu-iotests/001
> +++ b/tests/qemu-iotests/001
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
> index 7fb85084a1..fd413bce48 100755
> --- a/tests/qemu-iotests/002
> +++ b/tests/qemu-iotests/002
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
> index f008c57cdc..ccd3a39dfb 100755
> --- a/tests/qemu-iotests/003
> +++ b/tests/qemu-iotests/003
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> size=128M
> offset=67M
> diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
> index 64fab3e714..d308dc4b49 100755
> --- a/tests/qemu-iotests/004
> +++ b/tests/qemu-iotests/004
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
> index 3ab5490db3..6abd402423 100755
> --- a/tests/qemu-iotests/007
> +++ b/tests/qemu-iotests/007
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # currently only qcow2 allows for consistency checks using qemu-img
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
> # 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]'
> diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
> index 75067e36ad..2b81b119bf 100755
> --- a/tests/qemu-iotests/008
> +++ b/tests/qemu-iotests/008
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
> index bc4b461122..51b200db1d 100755
> --- a/tests/qemu-iotests/009
> +++ b/tests/qemu-iotests/009
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=6G
> diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
> index 6920408d28..48c533f632 100755
> --- a/tests/qemu-iotests/010
> +++ b/tests/qemu-iotests/010
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=6G
> diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
> index b4c7e8f799..8b1fce069a 100755
> --- a/tests/qemu-iotests/011
> +++ b/tests/qemu-iotests/011
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=6G
> diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
> index 2c3b42d9dd..12957285b3 100755
> --- a/tests/qemu-iotests/012
> +++ b/tests/qemu-iotests/012
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> # Remove once all tests are fixed to use TEST_IMG_FILE
> # correctly and common.rc sets it unconditionally
> diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
> index 5a4063e4f5..eec5387f3d 100755
> --- a/tests/qemu-iotests/015
> +++ b/tests/qemu-iotests/015
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # actually any format that supports snapshots
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
> # Internal snapshots are (currently) impossible with refcount_bits=1
> _unsupported_imgopts 'refcount_bits=1[^0-9]'
>
> diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
> index 83744f29a3..79875de454 100755
> --- a/tests/qemu-iotests/017
> +++ b/tests/qemu-iotests/017
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow qcow2 vmdk qed
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> TEST_OFFSETS="0 4294967296"
> diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
> index 71fa753b4e..6b0ebb37d2 100755
> --- a/tests/qemu-iotests/020
> +++ b/tests/qemu-iotests/020
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Any format supporting backing files
> _supported_fmt qcow qcow2 vmdk qed
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" \
> "subformat=twoGbMaxExtentFlat" \
> "subformat=twoGbMaxExtentSparse"
> diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021
> index f6555f3b74..f888269fd4 100755
> --- a/tests/qemu-iotests/021
> +++ b/tests/qemu-iotests/021
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
> index b68cd64b33..99eb08f57f 100755
> --- a/tests/qemu-iotests/022
> +++ b/tests/qemu-iotests/022
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Any format that supports snapshots
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> TEST_OFFSETS="10485760 4294967296"
> CLUSTER_SIZE="4096"
> diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
> index d9a4ebc5e7..e05d833452 100755
> --- a/tests/qemu-iotests/025
> +++ b/tests/qemu-iotests/025
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt raw qcow2 qed luks
> _supported_proto file sheepdog rbd nfs
> -_supported_os Linux
>
> echo "=== Creating image"
> echo
> diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
> index ca89ad7048..e30243608b 100755
> --- a/tests/qemu-iotests/026
> +++ b/tests/qemu-iotests/026
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Currently only qcow2 supports rebasing
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> _default_cache_mode "writethrough"
> _supported_cache_modes "writethrough" "none"
> # The refcount table tests expect a certain minimum width for refcount entries
> diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
> index b7df9701f7..4cb638022a 100755
> --- a/tests/qemu-iotests/027
> +++ b/tests/qemu-iotests/027
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt vmdk qcow qcow2 qed
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
> index 5f42f76cc6..94c2713132 100755
> --- a/tests/qemu-iotests/029
> +++ b/tests/qemu-iotests/029
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
> # Internal snapshots are (currently) impossible with refcount_bits=1
> _unsupported_imgopts 'refcount_bits=1[^0-9]'
>
> diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
> index ef92d8eee3..a3c25ec237 100755
> --- a/tests/qemu-iotests/031
> +++ b/tests/qemu-iotests/031
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qcow2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> CLUSTER_SIZE=65536
>
> diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
> index a1757bb15e..23c216c549 100755
> --- a/tests/qemu-iotests/032
> +++ b/tests/qemu-iotests/032
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This works for any image format (though unlikely to segfault for raw)
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> echo
> echo === Prepare image ===
> diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
> index cfdf1ec2ba..362a48c0a0 100755
> --- a/tests/qemu-iotests/033
> +++ b/tests/qemu-iotests/033
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
> index 46aa835936..ad6fa3115a 100755
> --- a/tests/qemu-iotests/035
> +++ b/tests/qemu-iotests/035
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
>
> size=6G
> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> index 1b56394129..f06ff67408 100755
> --- a/tests/qemu-iotests/036
> +++ b/tests/qemu-iotests/036
> @@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qcow2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> # Only qcow2v3 and later supports feature bits
> IMGOPTS="compat=1.1"
> diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
> index 0781bebefe..819a2a52d2 100755
> --- a/tests/qemu-iotests/037
> +++ b/tests/qemu-iotests/037
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow qcow2 vmdk qed
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" \
> "subformat=twoGbMaxExtentFlat" \
> "subformat=twoGbMaxExtentSparse"
> diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
> index a9a7fc3041..0e85b356b7 100755
> --- a/tests/qemu-iotests/042
> +++ b/tests/qemu-iotests/042
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
> echo
> echo "== Creating zero size image =="
> diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
> index 9894b154ec..67cc7e74c2 100755
> --- a/tests/qemu-iotests/043
> +++ b/tests/qemu-iotests/043
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Any format supporting backing files
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
> index 95160bea4c..543355c64f 100755
> --- a/tests/qemu-iotests/046
> +++ b/tests/qemu-iotests/046
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> CLUSTER_SIZE=64k
> size=128M
> diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047
> index ce81fc6fa7..4528465fb0 100755
> --- a/tests/qemu-iotests/047
> +++ b/tests/qemu-iotests/047
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> size=128M
>
> diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
> index bc09cd6717..c100d30ed0 100755
> --- a/tests/qemu-iotests/049
> +++ b/tests/qemu-iotests/049
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> filter_test_dir()
> {
> diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
> index dd7b2c72eb..211fc00797 100755
> --- a/tests/qemu-iotests/050
> +++ b/tests/qemu-iotests/050
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
> if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
> IMGOPTS=compat=1.1
> diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
> index 02ac960da4..a3deb1fcad 100755
> --- a/tests/qemu-iotests/051
> +++ b/tests/qemu-iotests/051
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # 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]\|$\)\)'
> diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
> index b3a2dc1143..6e2ecbfe21 100755
> --- a/tests/qemu-iotests/052
> +++ b/tests/qemu-iotests/052
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> # Don't do O_DIRECT on tmpfs
> _supported_cache_modes "writeback" "writethrough" "unsafe"
> diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
> index 50c62f0f56..e82bb69881 100755
> --- a/tests/qemu-iotests/053
> +++ b/tests/qemu-iotests/053
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 qcow
> _supported_proto file
> -_supported_os Linux
>
> echo
> echo "== Creating single sector image =="
> diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
> index 0d5e14f847..a8905b60d0 100755
> --- a/tests/qemu-iotests/054
> +++ b/tests/qemu-iotests/054
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> echo
> echo "creating too large image (1 EB)"
> diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
> index ed7400fed2..d5f818fcce 100755
> --- a/tests/qemu-iotests/062
> +++ b/tests/qemu-iotests/062
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> IMGOPTS="compat=1.1"
> IMG_SIZE=64M
> diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
> index 2d5c0ce9fb..fe4892e467 100755
> --- a/tests/qemu-iotests/063
> +++ b/tests/qemu-iotests/063
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow qcow2 vmdk qed raw
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" \
> "subformat=twoGbMaxExtentFlat" \
> "subformat=twoGbMaxExtentSparse"
> diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
> index f480986e35..28f8c98412 100755
> --- a/tests/qemu-iotests/066
> +++ b/tests/qemu-iotests/066
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> # Intentionally create an unaligned image
> IMGOPTS="compat=1.1"
> diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
> index fda16a6b0d..926c79b37c 100755
> --- a/tests/qemu-iotests/067
> +++ b/tests/qemu-iotests/067
> @@ -32,7 +32,6 @@ status=1 # failure is the default!
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # Because anything other than 16 would change the output of query-block
> _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
>
> diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
> index 881a022107..22f5ca3ba6 100755
> --- a/tests/qemu-iotests/068
> +++ b/tests/qemu-iotests/068
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> IMGOPTS="compat=1.1"
> IMG_SIZE=128K
> diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
> index 6a8e4aa22e..3974714852 100755
> --- a/tests/qemu-iotests/069
> +++ b/tests/qemu-iotests/069
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qed qcow qcow2 vmdk
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> IMG_SIZE=128K
> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
> index 7f3e5abd57..1cca9233d0 100755
> --- a/tests/qemu-iotests/071
> +++ b/tests/qemu-iotests/071
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
> index 6f9f247fa5..661b36da2d 100755
> --- a/tests/qemu-iotests/072
> +++ b/tests/qemu-iotests/072
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
> _supported_proto file
> -_supported_os Linux
>
> IMG_SIZE=64M
>
> diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
> index 990f90acbd..e684b1b780 100755
> --- a/tests/qemu-iotests/073
> +++ b/tests/qemu-iotests/073
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
> CLUSTER_SIZE=64k
> size=128M
> diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
> index 1b6594ebef..81f0c21f53 100755
> --- a/tests/qemu-iotests/079
> +++ b/tests/qemu-iotests/079
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
>
> echo "=== Check option preallocation and cluster_size ==="
> echo
> diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
> index d0afa46e9a..d084a0844d 100755
> --- a/tests/qemu-iotests/082
> +++ b/tests/qemu-iotests/082
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
>
> run_qemu_img()
> {
> diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
> index 68cb665987..d40fdab542 100755
> --- a/tests/qemu-iotests/085
> +++ b/tests/qemu-iotests/085
> @@ -56,7 +56,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
>
> # ${1}: unique identifier for the snapshot filename
> diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
> index 6609954908..ad029f1f09 100755
> --- a/tests/qemu-iotests/089
> +++ b/tests/qemu-iotests/089
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # Because anything other than 16 would change the output of qemu_io -c info
> _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
>
> diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
> index 193bae7d77..9f8cfbb80f 100755
> --- a/tests/qemu-iotests/090
> +++ b/tests/qemu-iotests/090
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
>
> IMG_SIZE=128K
>
> diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
> index 0bcca77261..9343e09492 100755
> --- a/tests/qemu-iotests/094
> +++ b/tests/qemu-iotests/094
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto nbd
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> _make_test_img 64M
> diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
> index 18505b7181..58fe174b5e 100755
> --- a/tests/qemu-iotests/095
> +++ b/tests/qemu-iotests/095
> @@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size_smaller=5M
> size_larger=100M
> diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
> index 461144c831..1c1d1c468f 100755
> --- a/tests/qemu-iotests/098
> +++ b/tests/qemu-iotests/098
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> IMGOPTS="compat=1.1"
>
> diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
> index cedd2b25dc..749ff66b8a 100755
> --- a/tests/qemu-iotests/102
> +++ b/tests/qemu-iotests/102
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> IMG_SIZE=64K
>
> diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
> index 6773e94d9f..554b9de054 100755
> --- a/tests/qemu-iotests/103
> +++ b/tests/qemu-iotests/103
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
> # Internal snapshots are (currently) impossible with refcount_bits=1
> _unsupported_imgopts 'refcount_bits=1[^0-9]'
>
> diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104
> index 390167bad4..c70f28a9a1 100755
> --- a/tests/qemu-iotests/104
> +++ b/tests/qemu-iotests/104
> @@ -34,7 +34,6 @@ trap "exit \$status" 0 1 2 3 15
>
> _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx
> _supported_proto generic
> -_supported_os Linux
>
> echo "=== Check qemu-img info output ==="
> echo
> diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
> index 3b5a596844..3346e8cb25 100755
> --- a/tests/qemu-iotests/105
> +++ b/tests/qemu-iotests/105
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 vmdk vhdx qed
> _supported_proto generic
> -_supported_os Linux
> _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
> "subformat=twoGbMaxExtentSparse"
>
> diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107
> index fcd5a24dfe..268ba27688 100755
> --- a/tests/qemu-iotests/107
> +++ b/tests/qemu-iotests/107
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
>
>
> IMG_SIZE=64K
> diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
> index fad672c1ae..4318341ac5 100755
> --- a/tests/qemu-iotests/110
> +++ b/tests/qemu-iotests/110
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Any format supporting backing files
> _supported_fmt qed qcow qcow2 vmdk
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> TEST_IMG_REL=$(basename "$TEST_IMG")
> diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
> index 57395be64c..490a5bbcb5 100755
> --- a/tests/qemu-iotests/111
> +++ b/tests/qemu-iotests/111
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qed qcow qcow2 vmdk
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> $QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
> diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
> index 6d81c75a9c..706c10b600 100755
> --- a/tests/qemu-iotests/112
> +++ b/tests/qemu-iotests/112
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qcow2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # 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'
> diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
> index f36b88f3f3..f90a744fc0 100755
> --- a/tests/qemu-iotests/114
> +++ b/tests/qemu-iotests/114
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
>
> TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
> index 7ed347010f..9ed3cb6a83 100755
> --- a/tests/qemu-iotests/115
> +++ b/tests/qemu-iotests/115
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # This test relies on refcounts being 64 bits wide (which does not work with
> # compat=0.10)
> _unsupported_imgopts 'refcount_bits=\([^6]\|.\([^4]\|$\)\)' 'compat=0.10'
> diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
> index 0af0f31c5a..f37b34f8b1 100755
> --- a/tests/qemu-iotests/117
> +++ b/tests/qemu-iotests/117
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> _make_test_img 64k
>
> diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
> index ca95b9276e..e9b4fbb009 100755
> --- a/tests/qemu-iotests/120
> +++ b/tests/qemu-iotests/120
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
> _unsupported_fmt luks
>
> _make_test_img 64M
> diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
> index 212dcd8f0d..dc4b8f5fb9 100755
> --- a/tests/qemu-iotests/125
> +++ b/tests/qemu-iotests/125
> @@ -44,7 +44,6 @@ get_image_size_on_host()
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> if [ -z "$TEST_IMG_FILE" ]; then
> TEST_IMG_FILE=$TEST_IMG
> diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
> index 96dc048d59..580fae5d62 100755
> --- a/tests/qemu-iotests/126
> +++ b/tests/qemu-iotests/126
> @@ -37,7 +37,6 @@ _supported_fmt qcow qcow2 qed vmdk
> # colons which separate a protocol prefix from the rest and colons which are
> # just part of the filename, so we cannot test protocols which require a prefix)
> _supported_proto file
> -_supported_os Linux
>
> echo
> echo '=== Testing plain files ==='
> diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
> index 3e941f74d4..b64926ab31 100755
> --- a/tests/qemu-iotests/127
> +++ b/tests/qemu-iotests/127
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> IMG_SIZE=64K
>
> diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
> index 1f6056d144..6f7cacc091 100755
> --- a/tests/qemu-iotests/133
> +++ b/tests/qemu-iotests/133
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> _make_test_img -b "$TEST_IMG.base"
> diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
> index e9e3e84c2a..141a2eaa7e 100755
> --- a/tests/qemu-iotests/134
> +++ b/tests/qemu-iotests/134
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
> index d9b98cf60a..6b62271876 100755
> --- a/tests/qemu-iotests/142
> +++ b/tests/qemu-iotests/142
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> # We test all cache modes anyway, but O_DIRECT needs to be supported
> _default_cache_mode none
> diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
> index c223867cb3..92249ac8da 100755
> --- a/tests/qemu-iotests/143
> +++ b/tests/qemu-iotests/143
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> keep_stderr=y \
> _launch_qemu 2> >(_filter_nbd)
> diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
> index 15157f33d7..011ed4f2bc 100755
> --- a/tests/qemu-iotests/144
> +++ b/tests/qemu-iotests/144
> @@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size=512M
>
> diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145
> index 28878dc8a1..9427549651 100755
> --- a/tests/qemu-iotests/145
> +++ b/tests/qemu-iotests/145
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> _make_test_img 1M
>
> diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
> index 08ad8a6730..c969a1a16f 100755
> --- a/tests/qemu-iotests/153
> +++ b/tests/qemu-iotests/153
> @@ -62,7 +62,6 @@ _check_ofd || _notrun "OFD lock not available"
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> _run_cmd()
> {
> diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
> index 8d134029c6..2ffa3ca942 100755
> --- a/tests/qemu-iotests/156
> +++ b/tests/qemu-iotests/156
> @@ -49,7 +49,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2 qed
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
> # Create source disk
> TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
> diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157
> index 69b25cab30..7cbac38099 100755
> --- a/tests/qemu-iotests/157
> +++ b/tests/qemu-iotests/157
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
> index 8c0928a7f9..ba4db6116a 100755
> --- a/tests/qemu-iotests/158
> +++ b/tests/qemu-iotests/158
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
> index 29066eebde..2557140ac2 100755
> --- a/tests/qemu-iotests/159
> +++ b/tests/qemu-iotests/159
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
> _unsupported_fmt luks
>
> TEST_SIZES="5 512 1024 1999 1K 64K 1M"
> diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
> index 2e9947fd9a..4e5ed74fd5 100755
> --- a/tests/qemu-iotests/162
> +++ b/tests/qemu-iotests/162
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> . ./common.filter
>
> _supported_fmt generic
> -_supported_os Linux
>
> test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)')
> [ "$test_ssh" = "" ] && _notrun "ssh support required"
> diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
> index 7deb7563c9..05dd6ed6c3 100755
> --- a/tests/qemu-iotests/170
> +++ b/tests/qemu-iotests/170
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
> _unsupported_fmt luks
>
> echo
> diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
> index 47036a5564..9e2fa2e73c 100755
> --- a/tests/qemu-iotests/173
> +++ b/tests/qemu-iotests/173
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto nfs
> -_supported_os Linux
>
> size=100M
>
> diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
> index ff3d7e7ec1..fd7627fb65 100755
> --- a/tests/qemu-iotests/182
> +++ b/tests/qemu-iotests/182
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size=32M
>
> diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
> index 93b7bd798a..fbe5a99beb 100755
> --- a/tests/qemu-iotests/183
> +++ b/tests/qemu-iotests/183
> @@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 raw qed quorum
> _supported_proto file
> -_supported_os Linux
>
> size=64M
> _make_test_img $size
> diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
> index 5dd2177b89..7e7d45babc 100755
> --- a/tests/qemu-iotests/186
> +++ b/tests/qemu-iotests/186
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
> _notrun "Requires a PC machine"
> diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
> index a45addde09..2fcef9e2bd 100755
> --- a/tests/qemu-iotests/187
> +++ b/tests/qemu-iotests/187
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size=64M
> _make_test_img $size
> diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
> index e1c1d407f0..eb766ad09f 100755
> --- a/tests/qemu-iotests/190
> +++ b/tests/qemu-iotests/190
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # See 178 for more extensive tests across more formats
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> echo "== Huge file =="
> echo
> diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
> index 1ea908ce3d..528022e8d8 100755
> --- a/tests/qemu-iotests/191
> +++ b/tests/qemu-iotests/191
> @@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size=64M
>
> diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
> index 158086f9d2..84d1ed7cfa 100755
> --- a/tests/qemu-iotests/192
> +++ b/tests/qemu-iotests/192
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
> _notrun "Requires a PC machine"
> diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
> index bd1b71ae5e..ef7b9a94e2 100755
> --- a/tests/qemu-iotests/195
> +++ b/tests/qemu-iotests/195
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
> index 2c664793f4..383d7d7f61 100755
> --- a/tests/qemu-iotests/197
> +++ b/tests/qemu-iotests/197
> @@ -51,7 +51,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Test is supported for any backing file; but we force qcow2 for our wrapper.
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
> # LUKS support may be possible, but it complicates things.
> _unsupported_fmt luks
>
> diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
> index 1c0f8cafc2..72d431f251 100755
> --- a/tests/qemu-iotests/200
> +++ b/tests/qemu-iotests/200
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
> BACKING_IMG="${TEST_DIR}/backing.img"
> TEST_IMG="${TEST_DIR}/test.img"
> diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
> index c1a452ff9a..21ec8a2ad8 100755
> --- a/tests/qemu-iotests/214
> +++ b/tests/qemu-iotests/214
> @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> # Repairing the corrupted image requires qemu-img check to store a
> # refcount up to 3, which requires at least two refcount bits.
> diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
> index 7b063d7cfa..958c14f5a0 100755
> --- a/tests/qemu-iotests/215
> +++ b/tests/qemu-iotests/215
> @@ -48,7 +48,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Test is supported for any backing file; but we force qcow2 for our wrapper.
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
> # LUKS support may be possible, but it complicates things.
> _unsupported_fmt luks
>
> diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
> index f5482bb669..58a78a6098 100755
> --- a/tests/qemu-iotests/217
> +++ b/tests/qemu-iotests/217
> @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This test is specific to qcow2
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> # This test needs clusters with at least a refcount of 2 so that
> # OFLAG_COPIED is not set. refcount_bits=1 is therefore unsupported.
> diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227
> index 10cf144eb0..bdd727a721 100755
> --- a/tests/qemu-iotests/227
> +++ b/tests/qemu-iotests/227
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
> index 5b2cbab9ac..c0b053ac30 100755
> --- a/tests/qemu-iotests/231
> +++ b/tests/qemu-iotests/231
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto rbd
> -_supported_os Linux
>
> BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
> touch "${BOGUS_CONF}"
> diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
> index b8b6c8cc4c..5855f94b9a 100755
> --- a/tests/qemu-iotests/233
> +++ b/tests/qemu-iotests/233
> @@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt raw qcow2
> _supported_proto file
> # If porting to non-Linux, consider using socat instead of ss in common.nbd
> -_supported_os Linux
> _require_command QEMU_NBD
>
> nbd_server_set_tcp_port
> diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
> index d3e663ed65..b4cf95096d 100755
> --- a/tests/qemu-iotests/240
> +++ b/tests/qemu-iotests/240
> @@ -33,7 +33,6 @@ status=1 # failure is the default!
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
> index fc50eb5dc1..546a794d3d 100755
> --- a/tests/qemu-iotests/247
> +++ b/tests/qemu-iotests/247
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Requires backing files and .bdrv_change_backing_file support
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
> size=128M
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 6/8] tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests
@ 2019-05-01 11:10 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 11:10 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> A lot of tests run fine on FreeBSD and macOS, too - the limitation
> to Linux here was likely just copied-and-pasted from other tests.
> Thus remove the "_supported_os Linux" line from tests that run
> successful in our CI pipelines on FreeBSD and macOS.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/qemu-iotests/001 | 1 -
> tests/qemu-iotests/002 | 1 -
> tests/qemu-iotests/003 | 1 -
> tests/qemu-iotests/004 | 1 -
> tests/qemu-iotests/007 | 1 -
> tests/qemu-iotests/008 | 1 -
> tests/qemu-iotests/009 | 1 -
> tests/qemu-iotests/010 | 1 -
> tests/qemu-iotests/011 | 1 -
> tests/qemu-iotests/012 | 1 -
> tests/qemu-iotests/015 | 1 -
> tests/qemu-iotests/017 | 1 -
> tests/qemu-iotests/020 | 1 -
> tests/qemu-iotests/021 | 1 -
> tests/qemu-iotests/022 | 1 -
> tests/qemu-iotests/025 | 1 -
> tests/qemu-iotests/026 | 1 -
> tests/qemu-iotests/027 | 1 -
> tests/qemu-iotests/029 | 1 -
> tests/qemu-iotests/031 | 1 -
> tests/qemu-iotests/032 | 1 -
> tests/qemu-iotests/033 | 1 -
> tests/qemu-iotests/035 | 1 -
> tests/qemu-iotests/036 | 1 -
> tests/qemu-iotests/037 | 1 -
> tests/qemu-iotests/042 | 1 -
> tests/qemu-iotests/043 | 1 -
> tests/qemu-iotests/046 | 1 -
> tests/qemu-iotests/047 | 1 -
> tests/qemu-iotests/049 | 1 -
> tests/qemu-iotests/050 | 1 -
> tests/qemu-iotests/051 | 1 -
> tests/qemu-iotests/052 | 1 -
> tests/qemu-iotests/053 | 1 -
> tests/qemu-iotests/054 | 1 -
> tests/qemu-iotests/062 | 1 -
> tests/qemu-iotests/063 | 1 -
> tests/qemu-iotests/066 | 1 -
> tests/qemu-iotests/067 | 1 -
> tests/qemu-iotests/068 | 1 -
> tests/qemu-iotests/069 | 1 -
> tests/qemu-iotests/071 | 1 -
> tests/qemu-iotests/072 | 1 -
> tests/qemu-iotests/073 | 1 -
> tests/qemu-iotests/079 | 1 -
> tests/qemu-iotests/082 | 1 -
> tests/qemu-iotests/085 | 1 -
> tests/qemu-iotests/089 | 1 -
> tests/qemu-iotests/090 | 1 -
> tests/qemu-iotests/094 | 1 -
> tests/qemu-iotests/095 | 1 -
> tests/qemu-iotests/098 | 1 -
> tests/qemu-iotests/102 | 1 -
> tests/qemu-iotests/103 | 1 -
> tests/qemu-iotests/104 | 1 -
> tests/qemu-iotests/105 | 1 -
> tests/qemu-iotests/107 | 1 -
> tests/qemu-iotests/110 | 1 -
> tests/qemu-iotests/111 | 1 -
> tests/qemu-iotests/112 | 1 -
> tests/qemu-iotests/114 | 1 -
> tests/qemu-iotests/115 | 1 -
> tests/qemu-iotests/117 | 1 -
> tests/qemu-iotests/120 | 1 -
> tests/qemu-iotests/125 | 1 -
> tests/qemu-iotests/126 | 1 -
> tests/qemu-iotests/127 | 1 -
> tests/qemu-iotests/133 | 1 -
> tests/qemu-iotests/134 | 1 -
> tests/qemu-iotests/142 | 1 -
> tests/qemu-iotests/143 | 1 -
> tests/qemu-iotests/144 | 1 -
> tests/qemu-iotests/145 | 1 -
> tests/qemu-iotests/153 | 1 -
> tests/qemu-iotests/156 | 1 -
> tests/qemu-iotests/157 | 1 -
> tests/qemu-iotests/158 | 1 -
> tests/qemu-iotests/159 | 1 -
> tests/qemu-iotests/162 | 1 -
> tests/qemu-iotests/170 | 1 -
> tests/qemu-iotests/173 | 1 -
> tests/qemu-iotests/182 | 1 -
> tests/qemu-iotests/183 | 1 -
> tests/qemu-iotests/186 | 1 -
> tests/qemu-iotests/187 | 1 -
> tests/qemu-iotests/190 | 1 -
> tests/qemu-iotests/191 | 1 -
> tests/qemu-iotests/192 | 1 -
> tests/qemu-iotests/195 | 1 -
> tests/qemu-iotests/197 | 1 -
> tests/qemu-iotests/200 | 1 -
> tests/qemu-iotests/214 | 1 -
> tests/qemu-iotests/215 | 1 -
> tests/qemu-iotests/217 | 1 -
> tests/qemu-iotests/227 | 1 -
> tests/qemu-iotests/231 | 1 -
> tests/qemu-iotests/233 | 1 -
> tests/qemu-iotests/240 | 1 -
> tests/qemu-iotests/247 | 1 -
> 99 files changed, 99 deletions(-)
>
> diff --git a/tests/qemu-iotests/001 b/tests/qemu-iotests/001
> index 5d266e170a..d87a535c33 100755
> --- a/tests/qemu-iotests/001
> +++ b/tests/qemu-iotests/001
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/002 b/tests/qemu-iotests/002
> index 7fb85084a1..fd413bce48 100755
> --- a/tests/qemu-iotests/002
> +++ b/tests/qemu-iotests/002
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/003 b/tests/qemu-iotests/003
> index f008c57cdc..ccd3a39dfb 100755
> --- a/tests/qemu-iotests/003
> +++ b/tests/qemu-iotests/003
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> size=128M
> offset=67M
> diff --git a/tests/qemu-iotests/004 b/tests/qemu-iotests/004
> index 64fab3e714..d308dc4b49 100755
> --- a/tests/qemu-iotests/004
> +++ b/tests/qemu-iotests/004
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx luks
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/007 b/tests/qemu-iotests/007
> index 3ab5490db3..6abd402423 100755
> --- a/tests/qemu-iotests/007
> +++ b/tests/qemu-iotests/007
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # currently only qcow2 allows for consistency checks using qemu-img
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
> # 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]'
> diff --git a/tests/qemu-iotests/008 b/tests/qemu-iotests/008
> index 75067e36ad..2b81b119bf 100755
> --- a/tests/qemu-iotests/008
> +++ b/tests/qemu-iotests/008
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/009 b/tests/qemu-iotests/009
> index bc4b461122..51b200db1d 100755
> --- a/tests/qemu-iotests/009
> +++ b/tests/qemu-iotests/009
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=6G
> diff --git a/tests/qemu-iotests/010 b/tests/qemu-iotests/010
> index 6920408d28..48c533f632 100755
> --- a/tests/qemu-iotests/010
> +++ b/tests/qemu-iotests/010
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=6G
> diff --git a/tests/qemu-iotests/011 b/tests/qemu-iotests/011
> index b4c7e8f799..8b1fce069a 100755
> --- a/tests/qemu-iotests/011
> +++ b/tests/qemu-iotests/011
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=6G
> diff --git a/tests/qemu-iotests/012 b/tests/qemu-iotests/012
> index 2c3b42d9dd..12957285b3 100755
> --- a/tests/qemu-iotests/012
> +++ b/tests/qemu-iotests/012
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> # Remove once all tests are fixed to use TEST_IMG_FILE
> # correctly and common.rc sets it unconditionally
> diff --git a/tests/qemu-iotests/015 b/tests/qemu-iotests/015
> index 5a4063e4f5..eec5387f3d 100755
> --- a/tests/qemu-iotests/015
> +++ b/tests/qemu-iotests/015
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # actually any format that supports snapshots
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
> # Internal snapshots are (currently) impossible with refcount_bits=1
> _unsupported_imgopts 'refcount_bits=1[^0-9]'
>
> diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
> index 83744f29a3..79875de454 100755
> --- a/tests/qemu-iotests/017
> +++ b/tests/qemu-iotests/017
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow qcow2 vmdk qed
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> TEST_OFFSETS="0 4294967296"
> diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
> index 71fa753b4e..6b0ebb37d2 100755
> --- a/tests/qemu-iotests/020
> +++ b/tests/qemu-iotests/020
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Any format supporting backing files
> _supported_fmt qcow qcow2 vmdk qed
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" \
> "subformat=twoGbMaxExtentFlat" \
> "subformat=twoGbMaxExtentSparse"
> diff --git a/tests/qemu-iotests/021 b/tests/qemu-iotests/021
> index f6555f3b74..f888269fd4 100755
> --- a/tests/qemu-iotests/021
> +++ b/tests/qemu-iotests/021
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/022 b/tests/qemu-iotests/022
> index b68cd64b33..99eb08f57f 100755
> --- a/tests/qemu-iotests/022
> +++ b/tests/qemu-iotests/022
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Any format that supports snapshots
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> TEST_OFFSETS="10485760 4294967296"
> CLUSTER_SIZE="4096"
> diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
> index d9a4ebc5e7..e05d833452 100755
> --- a/tests/qemu-iotests/025
> +++ b/tests/qemu-iotests/025
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt raw qcow2 qed luks
> _supported_proto file sheepdog rbd nfs
> -_supported_os Linux
>
> echo "=== Creating image"
> echo
> diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
> index ca89ad7048..e30243608b 100755
> --- a/tests/qemu-iotests/026
> +++ b/tests/qemu-iotests/026
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Currently only qcow2 supports rebasing
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> _default_cache_mode "writethrough"
> _supported_cache_modes "writethrough" "none"
> # The refcount table tests expect a certain minimum width for refcount entries
> diff --git a/tests/qemu-iotests/027 b/tests/qemu-iotests/027
> index b7df9701f7..4cb638022a 100755
> --- a/tests/qemu-iotests/027
> +++ b/tests/qemu-iotests/027
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt vmdk qcow qcow2 qed
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
> index 5f42f76cc6..94c2713132 100755
> --- a/tests/qemu-iotests/029
> +++ b/tests/qemu-iotests/029
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
> # Internal snapshots are (currently) impossible with refcount_bits=1
> _unsupported_imgopts 'refcount_bits=1[^0-9]'
>
> diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
> index ef92d8eee3..a3c25ec237 100755
> --- a/tests/qemu-iotests/031
> +++ b/tests/qemu-iotests/031
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qcow2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> CLUSTER_SIZE=65536
>
> diff --git a/tests/qemu-iotests/032 b/tests/qemu-iotests/032
> index a1757bb15e..23c216c549 100755
> --- a/tests/qemu-iotests/032
> +++ b/tests/qemu-iotests/032
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This works for any image format (though unlikely to segfault for raw)
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> echo
> echo === Prepare image ===
> diff --git a/tests/qemu-iotests/033 b/tests/qemu-iotests/033
> index cfdf1ec2ba..362a48c0a0 100755
> --- a/tests/qemu-iotests/033
> +++ b/tests/qemu-iotests/033
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/035 b/tests/qemu-iotests/035
> index 46aa835936..ad6fa3115a 100755
> --- a/tests/qemu-iotests/035
> +++ b/tests/qemu-iotests/035
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
>
> size=6G
> diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
> index 1b56394129..f06ff67408 100755
> --- a/tests/qemu-iotests/036
> +++ b/tests/qemu-iotests/036
> @@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qcow2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> # Only qcow2v3 and later supports feature bits
> IMGOPTS="compat=1.1"
> diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
> index 0781bebefe..819a2a52d2 100755
> --- a/tests/qemu-iotests/037
> +++ b/tests/qemu-iotests/037
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow qcow2 vmdk qed
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" \
> "subformat=twoGbMaxExtentFlat" \
> "subformat=twoGbMaxExtentSparse"
> diff --git a/tests/qemu-iotests/042 b/tests/qemu-iotests/042
> index a9a7fc3041..0e85b356b7 100755
> --- a/tests/qemu-iotests/042
> +++ b/tests/qemu-iotests/042
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
> echo
> echo "== Creating zero size image =="
> diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
> index 9894b154ec..67cc7e74c2 100755
> --- a/tests/qemu-iotests/043
> +++ b/tests/qemu-iotests/043
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Any format supporting backing files
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
> index 95160bea4c..543355c64f 100755
> --- a/tests/qemu-iotests/046
> +++ b/tests/qemu-iotests/046
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> CLUSTER_SIZE=64k
> size=128M
> diff --git a/tests/qemu-iotests/047 b/tests/qemu-iotests/047
> index ce81fc6fa7..4528465fb0 100755
> --- a/tests/qemu-iotests/047
> +++ b/tests/qemu-iotests/047
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> size=128M
>
> diff --git a/tests/qemu-iotests/049 b/tests/qemu-iotests/049
> index bc09cd6717..c100d30ed0 100755
> --- a/tests/qemu-iotests/049
> +++ b/tests/qemu-iotests/049
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> filter_test_dir()
> {
> diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
> index dd7b2c72eb..211fc00797 100755
> --- a/tests/qemu-iotests/050
> +++ b/tests/qemu-iotests/050
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
> if test "$IMGFMT" = qcow2 && test $IMGOPTS = ""; then
> IMGOPTS=compat=1.1
> diff --git a/tests/qemu-iotests/051 b/tests/qemu-iotests/051
> index 02ac960da4..a3deb1fcad 100755
> --- a/tests/qemu-iotests/051
> +++ b/tests/qemu-iotests/051
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # 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]\|$\)\)'
> diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
> index b3a2dc1143..6e2ecbfe21 100755
> --- a/tests/qemu-iotests/052
> +++ b/tests/qemu-iotests/052
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> # Don't do O_DIRECT on tmpfs
> _supported_cache_modes "writeback" "writethrough" "unsafe"
> diff --git a/tests/qemu-iotests/053 b/tests/qemu-iotests/053
> index 50c62f0f56..e82bb69881 100755
> --- a/tests/qemu-iotests/053
> +++ b/tests/qemu-iotests/053
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 qcow
> _supported_proto file
> -_supported_os Linux
>
> echo
> echo "== Creating single sector image =="
> diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
> index 0d5e14f847..a8905b60d0 100755
> --- a/tests/qemu-iotests/054
> +++ b/tests/qemu-iotests/054
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> echo
> echo "creating too large image (1 EB)"
> diff --git a/tests/qemu-iotests/062 b/tests/qemu-iotests/062
> index ed7400fed2..d5f818fcce 100755
> --- a/tests/qemu-iotests/062
> +++ b/tests/qemu-iotests/062
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> IMGOPTS="compat=1.1"
> IMG_SIZE=64M
> diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
> index 2d5c0ce9fb..fe4892e467 100755
> --- a/tests/qemu-iotests/063
> +++ b/tests/qemu-iotests/063
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow qcow2 vmdk qed raw
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" \
> "subformat=twoGbMaxExtentFlat" \
> "subformat=twoGbMaxExtentSparse"
> diff --git a/tests/qemu-iotests/066 b/tests/qemu-iotests/066
> index f480986e35..28f8c98412 100755
> --- a/tests/qemu-iotests/066
> +++ b/tests/qemu-iotests/066
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> # Intentionally create an unaligned image
> IMGOPTS="compat=1.1"
> diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
> index fda16a6b0d..926c79b37c 100755
> --- a/tests/qemu-iotests/067
> +++ b/tests/qemu-iotests/067
> @@ -32,7 +32,6 @@ status=1 # failure is the default!
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # Because anything other than 16 would change the output of query-block
> _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
>
> diff --git a/tests/qemu-iotests/068 b/tests/qemu-iotests/068
> index 881a022107..22f5ca3ba6 100755
> --- a/tests/qemu-iotests/068
> +++ b/tests/qemu-iotests/068
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qocw2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto generic
> -_supported_os Linux
>
> IMGOPTS="compat=1.1"
> IMG_SIZE=128K
> diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
> index 6a8e4aa22e..3974714852 100755
> --- a/tests/qemu-iotests/069
> +++ b/tests/qemu-iotests/069
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qed qcow qcow2 vmdk
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> IMG_SIZE=128K
> diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
> index 7f3e5abd57..1cca9233d0 100755
> --- a/tests/qemu-iotests/071
> +++ b/tests/qemu-iotests/071
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
> index 6f9f247fa5..661b36da2d 100755
> --- a/tests/qemu-iotests/072
> +++ b/tests/qemu-iotests/072
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow
> _supported_proto file
> -_supported_os Linux
>
> IMG_SIZE=64M
>
> diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
> index 990f90acbd..e684b1b780 100755
> --- a/tests/qemu-iotests/073
> +++ b/tests/qemu-iotests/073
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
> CLUSTER_SIZE=64k
> size=128M
> diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
> index 1b6594ebef..81f0c21f53 100755
> --- a/tests/qemu-iotests/079
> +++ b/tests/qemu-iotests/079
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
>
> echo "=== Check option preallocation and cluster_size ==="
> echo
> diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
> index d0afa46e9a..d084a0844d 100755
> --- a/tests/qemu-iotests/082
> +++ b/tests/qemu-iotests/082
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
>
> run_qemu_img()
> {
> diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085
> index 68cb665987..d40fdab542 100755
> --- a/tests/qemu-iotests/085
> +++ b/tests/qemu-iotests/085
> @@ -56,7 +56,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
>
> # ${1}: unique identifier for the snapshot filename
> diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
> index 6609954908..ad029f1f09 100755
> --- a/tests/qemu-iotests/089
> +++ b/tests/qemu-iotests/089
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # Because anything other than 16 would change the output of qemu_io -c info
> _unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'
>
> diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
> index 193bae7d77..9f8cfbb80f 100755
> --- a/tests/qemu-iotests/090
> +++ b/tests/qemu-iotests/090
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
>
> IMG_SIZE=128K
>
> diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
> index 0bcca77261..9343e09492 100755
> --- a/tests/qemu-iotests/094
> +++ b/tests/qemu-iotests/094
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto nbd
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> _make_test_img 64M
> diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
> index 18505b7181..58fe174b5e 100755
> --- a/tests/qemu-iotests/095
> +++ b/tests/qemu-iotests/095
> @@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size_smaller=5M
> size_larger=100M
> diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
> index 461144c831..1c1d1c468f 100755
> --- a/tests/qemu-iotests/098
> +++ b/tests/qemu-iotests/098
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> IMGOPTS="compat=1.1"
>
> diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
> index cedd2b25dc..749ff66b8a 100755
> --- a/tests/qemu-iotests/102
> +++ b/tests/qemu-iotests/102
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> IMG_SIZE=64K
>
> diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
> index 6773e94d9f..554b9de054 100755
> --- a/tests/qemu-iotests/103
> +++ b/tests/qemu-iotests/103
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
> # Internal snapshots are (currently) impossible with refcount_bits=1
> _unsupported_imgopts 'refcount_bits=1[^0-9]'
>
> diff --git a/tests/qemu-iotests/104 b/tests/qemu-iotests/104
> index 390167bad4..c70f28a9a1 100755
> --- a/tests/qemu-iotests/104
> +++ b/tests/qemu-iotests/104
> @@ -34,7 +34,6 @@ trap "exit \$status" 0 1 2 3 15
>
> _supported_fmt raw qcow qcow2 qed vdi vmdk vhdx
> _supported_proto generic
> -_supported_os Linux
>
> echo "=== Check qemu-img info output ==="
> echo
> diff --git a/tests/qemu-iotests/105 b/tests/qemu-iotests/105
> index 3b5a596844..3346e8cb25 100755
> --- a/tests/qemu-iotests/105
> +++ b/tests/qemu-iotests/105
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 vmdk vhdx qed
> _supported_proto generic
> -_supported_os Linux
> _unsupported_imgopts "subformat=twoGbMaxExtentFlat" \
> "subformat=twoGbMaxExtentSparse"
>
> diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107
> index fcd5a24dfe..268ba27688 100755
> --- a/tests/qemu-iotests/107
> +++ b/tests/qemu-iotests/107
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file nfs
> -_supported_os Linux
>
>
> IMG_SIZE=64K
> diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
> index fad672c1ae..4318341ac5 100755
> --- a/tests/qemu-iotests/110
> +++ b/tests/qemu-iotests/110
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Any format supporting backing files
> _supported_fmt qed qcow qcow2 vmdk
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> TEST_IMG_REL=$(basename "$TEST_IMG")
> diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
> index 57395be64c..490a5bbcb5 100755
> --- a/tests/qemu-iotests/111
> +++ b/tests/qemu-iotests/111
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qed qcow qcow2 vmdk
> _supported_proto file
> -_supported_os Linux
> _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
>
> $QEMU_IMG create -f $IMGFMT -b "$TEST_IMG.inexistent" "$TEST_IMG" 2>&1 \
> diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
> index 6d81c75a9c..706c10b600 100755
> --- a/tests/qemu-iotests/112
> +++ b/tests/qemu-iotests/112
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This tests qcow2-specific low-level functionality
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # 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'
> diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
> index f36b88f3f3..f90a744fc0 100755
> --- a/tests/qemu-iotests/114
> +++ b/tests/qemu-iotests/114
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
>
> TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
> index 7ed347010f..9ed3cb6a83 100755
> --- a/tests/qemu-iotests/115
> +++ b/tests/qemu-iotests/115
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
> # This test relies on refcounts being 64 bits wide (which does not work with
> # compat=0.10)
> _unsupported_imgopts 'refcount_bits=\([^6]\|.\([^4]\|$\)\)' 'compat=0.10'
> diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
> index 0af0f31c5a..f37b34f8b1 100755
> --- a/tests/qemu-iotests/117
> +++ b/tests/qemu-iotests/117
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> _make_test_img 64k
>
> diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
> index ca95b9276e..e9b4fbb009 100755
> --- a/tests/qemu-iotests/120
> +++ b/tests/qemu-iotests/120
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
> _unsupported_fmt luks
>
> _make_test_img 64M
> diff --git a/tests/qemu-iotests/125 b/tests/qemu-iotests/125
> index 212dcd8f0d..dc4b8f5fb9 100755
> --- a/tests/qemu-iotests/125
> +++ b/tests/qemu-iotests/125
> @@ -44,7 +44,6 @@ get_image_size_on_host()
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> if [ -z "$TEST_IMG_FILE" ]; then
> TEST_IMG_FILE=$TEST_IMG
> diff --git a/tests/qemu-iotests/126 b/tests/qemu-iotests/126
> index 96dc048d59..580fae5d62 100755
> --- a/tests/qemu-iotests/126
> +++ b/tests/qemu-iotests/126
> @@ -37,7 +37,6 @@ _supported_fmt qcow qcow2 qed vmdk
> # colons which separate a protocol prefix from the rest and colons which are
> # just part of the filename, so we cannot test protocols which require a prefix)
> _supported_proto file
> -_supported_os Linux
>
> echo
> echo '=== Testing plain files ==='
> diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
> index 3e941f74d4..b64926ab31 100755
> --- a/tests/qemu-iotests/127
> +++ b/tests/qemu-iotests/127
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> IMG_SIZE=64K
>
> diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
> index 1f6056d144..6f7cacc091 100755
> --- a/tests/qemu-iotests/133
> +++ b/tests/qemu-iotests/133
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> TEST_IMG="$TEST_IMG.base" _make_test_img 64M
> _make_test_img -b "$TEST_IMG.base"
> diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
> index e9e3e84c2a..141a2eaa7e 100755
> --- a/tests/qemu-iotests/134
> +++ b/tests/qemu-iotests/134
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/142 b/tests/qemu-iotests/142
> index d9b98cf60a..6b62271876 100755
> --- a/tests/qemu-iotests/142
> +++ b/tests/qemu-iotests/142
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> # We test all cache modes anyway, but O_DIRECT needs to be supported
> _default_cache_mode none
> diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
> index c223867cb3..92249ac8da 100755
> --- a/tests/qemu-iotests/143
> +++ b/tests/qemu-iotests/143
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> keep_stderr=y \
> _launch_qemu 2> >(_filter_nbd)
> diff --git a/tests/qemu-iotests/144 b/tests/qemu-iotests/144
> index 15157f33d7..011ed4f2bc 100755
> --- a/tests/qemu-iotests/144
> +++ b/tests/qemu-iotests/144
> @@ -46,7 +46,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size=512M
>
> diff --git a/tests/qemu-iotests/145 b/tests/qemu-iotests/145
> index 28878dc8a1..9427549651 100755
> --- a/tests/qemu-iotests/145
> +++ b/tests/qemu-iotests/145
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> _make_test_img 1M
>
> diff --git a/tests/qemu-iotests/153 b/tests/qemu-iotests/153
> index 08ad8a6730..c969a1a16f 100755
> --- a/tests/qemu-iotests/153
> +++ b/tests/qemu-iotests/153
> @@ -62,7 +62,6 @@ _check_ofd || _notrun "OFD lock not available"
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> _run_cmd()
> {
> diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
> index 8d134029c6..2ffa3ca942 100755
> --- a/tests/qemu-iotests/156
> +++ b/tests/qemu-iotests/156
> @@ -49,7 +49,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow2 qed
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
> # Create source disk
> TEST_IMG="$TEST_IMG.backing" _make_test_img 1M
> diff --git a/tests/qemu-iotests/157 b/tests/qemu-iotests/157
> index 69b25cab30..7cbac38099 100755
> --- a/tests/qemu-iotests/157
> +++ b/tests/qemu-iotests/157
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
> index 8c0928a7f9..ba4db6116a 100755
> --- a/tests/qemu-iotests/158
> +++ b/tests/qemu-iotests/158
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt qcow qcow2
> _supported_proto generic
> _unsupported_proto vxhs
> -_supported_os Linux
>
>
> size=128M
> diff --git a/tests/qemu-iotests/159 b/tests/qemu-iotests/159
> index 29066eebde..2557140ac2 100755
> --- a/tests/qemu-iotests/159
> +++ b/tests/qemu-iotests/159
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
> _unsupported_fmt luks
>
> TEST_SIZES="5 512 1024 1999 1K 64K 1M"
> diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
> index 2e9947fd9a..4e5ed74fd5 100755
> --- a/tests/qemu-iotests/162
> +++ b/tests/qemu-iotests/162
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> . ./common.filter
>
> _supported_fmt generic
> -_supported_os Linux
>
> test_ssh=$($QEMU_IMG --help | grep '^Supported formats:.* ssh\( \|$\)')
> [ "$test_ssh" = "" ] && _notrun "ssh support required"
> diff --git a/tests/qemu-iotests/170 b/tests/qemu-iotests/170
> index 7deb7563c9..05dd6ed6c3 100755
> --- a/tests/qemu-iotests/170
> +++ b/tests/qemu-iotests/170
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
> _unsupported_fmt luks
>
> echo
> diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
> index 47036a5564..9e2fa2e73c 100755
> --- a/tests/qemu-iotests/173
> +++ b/tests/qemu-iotests/173
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto nfs
> -_supported_os Linux
>
> size=100M
>
> diff --git a/tests/qemu-iotests/182 b/tests/qemu-iotests/182
> index ff3d7e7ec1..fd7627fb65 100755
> --- a/tests/qemu-iotests/182
> +++ b/tests/qemu-iotests/182
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size=32M
>
> diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
> index 93b7bd798a..fbe5a99beb 100755
> --- a/tests/qemu-iotests/183
> +++ b/tests/qemu-iotests/183
> @@ -44,7 +44,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 raw qed quorum
> _supported_proto file
> -_supported_os Linux
>
> size=64M
> _make_test_img $size
> diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
> index 5dd2177b89..7e7d45babc 100755
> --- a/tests/qemu-iotests/186
> +++ b/tests/qemu-iotests/186
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
> _notrun "Requires a PC machine"
> diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
> index a45addde09..2fcef9e2bd 100755
> --- a/tests/qemu-iotests/187
> +++ b/tests/qemu-iotests/187
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size=64M
> _make_test_img $size
> diff --git a/tests/qemu-iotests/190 b/tests/qemu-iotests/190
> index e1c1d407f0..eb766ad09f 100755
> --- a/tests/qemu-iotests/190
> +++ b/tests/qemu-iotests/190
> @@ -41,7 +41,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # See 178 for more extensive tests across more formats
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> echo "== Huge file =="
> echo
> diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
> index 1ea908ce3d..528022e8d8 100755
> --- a/tests/qemu-iotests/191
> +++ b/tests/qemu-iotests/191
> @@ -43,7 +43,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> size=64M
>
> diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
> index 158086f9d2..84d1ed7cfa 100755
> --- a/tests/qemu-iotests/192
> +++ b/tests/qemu-iotests/192
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then
> _notrun "Requires a PC machine"
> diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
> index bd1b71ae5e..ef7b9a94e2 100755
> --- a/tests/qemu-iotests/195
> +++ b/tests/qemu-iotests/195
> @@ -39,7 +39,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/197 b/tests/qemu-iotests/197
> index 2c664793f4..383d7d7f61 100755
> --- a/tests/qemu-iotests/197
> +++ b/tests/qemu-iotests/197
> @@ -51,7 +51,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Test is supported for any backing file; but we force qcow2 for our wrapper.
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
> # LUKS support may be possible, but it complicates things.
> _unsupported_fmt luks
>
> diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
> index 1c0f8cafc2..72d431f251 100755
> --- a/tests/qemu-iotests/200
> +++ b/tests/qemu-iotests/200
> @@ -42,7 +42,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
> BACKING_IMG="${TEST_DIR}/backing.img"
> TEST_IMG="${TEST_DIR}/test.img"
> diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
> index c1a452ff9a..21ec8a2ad8 100755
> --- a/tests/qemu-iotests/214
> +++ b/tests/qemu-iotests/214
> @@ -36,7 +36,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> # Repairing the corrupted image requires qemu-img check to store a
> # refcount up to 3, which requires at least two refcount bits.
> diff --git a/tests/qemu-iotests/215 b/tests/qemu-iotests/215
> index 7b063d7cfa..958c14f5a0 100755
> --- a/tests/qemu-iotests/215
> +++ b/tests/qemu-iotests/215
> @@ -48,7 +48,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Test is supported for any backing file; but we force qcow2 for our wrapper.
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
> # LUKS support may be possible, but it complicates things.
> _unsupported_fmt luks
>
> diff --git a/tests/qemu-iotests/217 b/tests/qemu-iotests/217
> index f5482bb669..58a78a6098 100755
> --- a/tests/qemu-iotests/217
> +++ b/tests/qemu-iotests/217
> @@ -37,7 +37,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # This test is specific to qcow2
> _supported_fmt qcow2
> _supported_proto file
> -_supported_os Linux
>
> # This test needs clusters with at least a refcount of 2 so that
> # OFLAG_COPIED is not set. refcount_bits=1 is therefore unsupported.
> diff --git a/tests/qemu-iotests/227 b/tests/qemu-iotests/227
> index 10cf144eb0..bdd727a721 100755
> --- a/tests/qemu-iotests/227
> +++ b/tests/qemu-iotests/227
> @@ -38,7 +38,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto file
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/231 b/tests/qemu-iotests/231
> index 5b2cbab9ac..c0b053ac30 100755
> --- a/tests/qemu-iotests/231
> +++ b/tests/qemu-iotests/231
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
>
> _supported_fmt generic
> _supported_proto rbd
> -_supported_os Linux
>
> BOGUS_CONF=${TEST_DIR}/ceph-$$.conf
> touch "${BOGUS_CONF}"
> diff --git a/tests/qemu-iotests/233 b/tests/qemu-iotests/233
> index b8b6c8cc4c..5855f94b9a 100755
> --- a/tests/qemu-iotests/233
> +++ b/tests/qemu-iotests/233
> @@ -47,7 +47,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> _supported_fmt raw qcow2
> _supported_proto file
> # If porting to non-Linux, consider using socat instead of ss in common.nbd
> -_supported_os Linux
> _require_command QEMU_NBD
>
> nbd_server_set_tcp_port
> diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
> index d3e663ed65..b4cf95096d 100755
> --- a/tests/qemu-iotests/240
> +++ b/tests/qemu-iotests/240
> @@ -33,7 +33,6 @@ status=1 # failure is the default!
>
> _supported_fmt generic
> _supported_proto generic
> -_supported_os Linux
>
> do_run_qemu()
> {
> diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
> index fc50eb5dc1..546a794d3d 100755
> --- a/tests/qemu-iotests/247
> +++ b/tests/qemu-iotests/247
> @@ -40,7 +40,6 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
> # Requires backing files and .bdrv_change_backing_file support
> _supported_fmt qcow2 qed
> _supported_proto file
> -_supported_os Linux
>
> size=128M
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 7/8] tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
Currently, all tests are in the "auto" group. This is a little bit pointless.
OTOH, we need a group for the tests that we can automatically run during
"make check" each time, too. Tests in this new group are supposed to run
with every possible QEMU configuration, for example they must run with every
QEMU binary (also non-x86), without failing when an optional features is
missing (but reporting "skip" is ok), and be able to run on all kind of host
filesystems and users (i.e. also as "nobody" or "root").
So let's use the "auto" group for this class of tests now. The initial
list has been determined by running the iotests with non-x86 QEMU targets
and with our CI pipelines on Gitlab, Cirrus-CI and Travis (i.e. including
macOS and FreeBSD).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/group | 169 +++++++++++++++++++++------------------
1 file changed, 91 insertions(+), 78 deletions(-)
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index bae7718380..4d0b6ae256 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -1,8 +1,21 @@
#
# QA groups control file
# Defines test groups
+#
+# Some notes about the groups:
+#
# - do not start group names with a digit
#
+# - quick : Tests in this group should finish within some few seconds.
+#
+# - img : Tests in this group can be used to excercise the qemu-img tool.
+#
+# - auto : Tests in this group are used during "make check" and should be
+# runnable in any case. That means they should run with every QEMU binary
+# (also non-x86), with every QEMU configuration (i.e. must not fail if
+# an optional feature is not compiled in - but reporting a "skip" is ok),
+# and work all kind of host filesystems and users (e.g. "nobody" or "root").
+#
#
# test-group association ... one line per test
@@ -32,11 +45,11 @@
023 rw auto
024 rw backing auto quick
025 rw auto quick
-026 rw blkdbg auto
+026 rw blkdbg
027 rw auto quick
028 rw backing auto quick
029 rw auto quick
-030 rw auto backing
+030 rw backing
031 rw auto quick
032 rw auto quick
033 rw auto quick
@@ -46,35 +59,35 @@
037 rw auto backing quick
038 rw auto backing quick
039 rw auto quick
-040 rw auto
-041 rw auto backing
+040 rw
+041 rw backing
042 rw auto quick
043 rw auto backing
-044 rw auto
-045 rw auto quick
+044 rw
+045 rw quick
046 rw auto aio quick
047 rw auto quick
048 img auto quick
049 rw auto
050 rw auto backing quick
-051 rw auto
+051 rw
052 rw auto backing quick
053 rw auto quick
054 rw auto quick
-055 rw auto
-056 rw auto backing
-057 rw auto
-058 rw auto quick
+055 rw
+056 rw backing
+057 rw
+058 rw quick
059 rw auto quick
060 rw auto quick
061 rw auto
062 rw auto quick
063 rw auto quick
064 rw auto quick
-065 rw auto quick
+065 rw quick
066 rw auto quick
-067 rw auto quick
-068 rw auto quick
+067 rw quick
+068 rw quick
069 rw auto quick
070 rw auto quick
071 rw auto quick
@@ -91,18 +104,18 @@
082 rw auto quick
083 rw auto
084 img auto quick
-085 rw auto
+085 rw
086 rw auto quick
-087 rw auto quick
+087 rw quick
088 rw auto quick
089 rw auto quick
090 rw auto quick
091 rw auto migration
092 rw auto quick
-093 auto
+093
094 rw auto quick
-095 rw auto quick
-096 rw auto quick
+095 rw quick
+096 rw quick
097 rw auto backing
098 rw auto backing quick
099 rw auto quick
@@ -118,60 +131,60 @@
109 rw auto
110 rw auto backing quick
111 rw auto quick
-112 rw auto
+112 rw
113 rw auto quick
114 rw auto quick
-115 rw auto
+115 rw
116 rw auto quick
117 rw auto
-118 rw auto
+118 rw
119 rw auto quick
120 rw auto quick
-121 rw auto
+121 rw
122 rw auto
123 rw auto quick
-124 rw auto backing
-125 rw auto
+124 rw backing
+125 rw
126 rw auto backing
-127 rw auto backing quick
+127 rw backing quick
128 rw auto quick
-129 rw auto quick
+129 rw quick
130 rw auto quick
131 rw auto quick
-132 rw auto quick
+132 rw quick
133 auto quick
134 rw auto quick
135 rw auto
-136 rw auto
+136 rw
137 rw auto
138 rw auto quick
-139 rw auto quick
+139 rw quick
140 rw auto quick
141 rw auto quick
142 auto
143 auto quick
-144 rw auto quick
-145 auto quick
+144 rw quick
+145 quick
146 auto quick
-147 auto
-148 rw auto quick
+147 img
+148 rw quick
149 rw auto sudo
150 rw auto quick
-151 rw auto
-152 rw auto quick
-153 rw auto quick
+151 rw
+152 rw quick
+153 rw quick
154 rw auto backing quick
-155 rw auto
+155 rw
156 rw auto quick
-157 auto
+157 quick
158 rw auto quick
159 rw auto quick
160 rw auto quick
161 rw auto quick
162 auto quick
-163 rw auto
-165 rw auto quick
-169 rw auto quick migration
+163 rw
+165 rw quick
+169 rw quick migration
170 rw auto quick
171 rw auto quick
172 auto
@@ -180,71 +193,71 @@
175 auto quick
176 rw auto backing
177 rw auto quick
-178 auto
+178 img
179 rw auto quick
181 rw auto migration
-182 rw auto quick
-183 rw auto migration
+182 rw quick
+183 rw migration
184 rw auto quick
-185 rw auto
+185 rw
186 rw auto
187 rw auto
-188 rw auto quick
-189 rw auto
+188 rw quick
+189 rw
190 rw auto quick
191 rw auto
192 rw auto quick
-194 rw auto migration quick
+194 rw migration quick
195 rw auto quick
-196 rw auto quick migration
+196 rw quick migration
197 rw auto quick
-198 rw auto
-199 rw auto migration
-200 rw auto
+198 rw
+199 rw migration
+200 rw
201 rw auto migration
-202 rw auto quick
-203 rw auto migration
-204 rw auto quick
-205 rw auto quick
-206 rw auto
+202 rw quick
+203 rw migration
+204 rw quick
+205 rw quick
+206 rw
207 rw auto
-208 rw auto quick
-209 rw auto quick
+208 rw quick
+209 rw quick
210 rw auto
211 rw auto quick
212 rw auto quick
213 rw auto quick
214 rw auto
215 rw auto quick
-216 rw auto quick
+216 rw quick
217 rw auto quick
-218 rw auto quick
-219 rw auto
+218 rw quick
+219 rw
220 rw auto
221 rw auto quick
-222 rw auto quick
-223 rw auto quick
-224 rw auto quick
+222 rw quick
+223 rw quick
+224 rw quick
225 rw auto quick
226 auto quick
-227 auto quick
-228 rw auto quick
+227 quick
+228 rw quick
229 auto quick
231 auto quick
-232 auto quick
+232 quick
233 auto quick
-234 auto quick migration
-235 auto quick
-236 auto quick
+234 quick migration
+235 quick
+236 quick
237 rw auto quick
-238 auto quick
+238 quick
239 rw auto quick
-240 auto quick
+240 quick
241 rw auto quick
-242 rw auto quick
+242 rw quick
243 rw auto quick
244 rw auto quick
-245 rw auto
-246 rw auto quick
+245 rw
+246 rw quick
247 rw auto quick
-248 rw auto quick
+248 rw quick
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 7/8] tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
Currently, all tests are in the "auto" group. This is a little bit pointless.
OTOH, we need a group for the tests that we can automatically run during
"make check" each time, too. Tests in this new group are supposed to run
with every possible QEMU configuration, for example they must run with every
QEMU binary (also non-x86), without failing when an optional features is
missing (but reporting "skip" is ok), and be able to run on all kind of host
filesystems and users (i.e. also as "nobody" or "root").
So let's use the "auto" group for this class of tests now. The initial
list has been determined by running the iotests with non-x86 QEMU targets
and with our CI pipelines on Gitlab, Cirrus-CI and Travis (i.e. including
macOS and FreeBSD).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qemu-iotests/group | 169 +++++++++++++++++++++------------------
1 file changed, 91 insertions(+), 78 deletions(-)
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index bae7718380..4d0b6ae256 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -1,8 +1,21 @@
#
# QA groups control file
# Defines test groups
+#
+# Some notes about the groups:
+#
# - do not start group names with a digit
#
+# - quick : Tests in this group should finish within some few seconds.
+#
+# - img : Tests in this group can be used to excercise the qemu-img tool.
+#
+# - auto : Tests in this group are used during "make check" and should be
+# runnable in any case. That means they should run with every QEMU binary
+# (also non-x86), with every QEMU configuration (i.e. must not fail if
+# an optional feature is not compiled in - but reporting a "skip" is ok),
+# and work all kind of host filesystems and users (e.g. "nobody" or "root").
+#
#
# test-group association ... one line per test
@@ -32,11 +45,11 @@
023 rw auto
024 rw backing auto quick
025 rw auto quick
-026 rw blkdbg auto
+026 rw blkdbg
027 rw auto quick
028 rw backing auto quick
029 rw auto quick
-030 rw auto backing
+030 rw backing
031 rw auto quick
032 rw auto quick
033 rw auto quick
@@ -46,35 +59,35 @@
037 rw auto backing quick
038 rw auto backing quick
039 rw auto quick
-040 rw auto
-041 rw auto backing
+040 rw
+041 rw backing
042 rw auto quick
043 rw auto backing
-044 rw auto
-045 rw auto quick
+044 rw
+045 rw quick
046 rw auto aio quick
047 rw auto quick
048 img auto quick
049 rw auto
050 rw auto backing quick
-051 rw auto
+051 rw
052 rw auto backing quick
053 rw auto quick
054 rw auto quick
-055 rw auto
-056 rw auto backing
-057 rw auto
-058 rw auto quick
+055 rw
+056 rw backing
+057 rw
+058 rw quick
059 rw auto quick
060 rw auto quick
061 rw auto
062 rw auto quick
063 rw auto quick
064 rw auto quick
-065 rw auto quick
+065 rw quick
066 rw auto quick
-067 rw auto quick
-068 rw auto quick
+067 rw quick
+068 rw quick
069 rw auto quick
070 rw auto quick
071 rw auto quick
@@ -91,18 +104,18 @@
082 rw auto quick
083 rw auto
084 img auto quick
-085 rw auto
+085 rw
086 rw auto quick
-087 rw auto quick
+087 rw quick
088 rw auto quick
089 rw auto quick
090 rw auto quick
091 rw auto migration
092 rw auto quick
-093 auto
+093
094 rw auto quick
-095 rw auto quick
-096 rw auto quick
+095 rw quick
+096 rw quick
097 rw auto backing
098 rw auto backing quick
099 rw auto quick
@@ -118,60 +131,60 @@
109 rw auto
110 rw auto backing quick
111 rw auto quick
-112 rw auto
+112 rw
113 rw auto quick
114 rw auto quick
-115 rw auto
+115 rw
116 rw auto quick
117 rw auto
-118 rw auto
+118 rw
119 rw auto quick
120 rw auto quick
-121 rw auto
+121 rw
122 rw auto
123 rw auto quick
-124 rw auto backing
-125 rw auto
+124 rw backing
+125 rw
126 rw auto backing
-127 rw auto backing quick
+127 rw backing quick
128 rw auto quick
-129 rw auto quick
+129 rw quick
130 rw auto quick
131 rw auto quick
-132 rw auto quick
+132 rw quick
133 auto quick
134 rw auto quick
135 rw auto
-136 rw auto
+136 rw
137 rw auto
138 rw auto quick
-139 rw auto quick
+139 rw quick
140 rw auto quick
141 rw auto quick
142 auto
143 auto quick
-144 rw auto quick
-145 auto quick
+144 rw quick
+145 quick
146 auto quick
-147 auto
-148 rw auto quick
+147 img
+148 rw quick
149 rw auto sudo
150 rw auto quick
-151 rw auto
-152 rw auto quick
-153 rw auto quick
+151 rw
+152 rw quick
+153 rw quick
154 rw auto backing quick
-155 rw auto
+155 rw
156 rw auto quick
-157 auto
+157 quick
158 rw auto quick
159 rw auto quick
160 rw auto quick
161 rw auto quick
162 auto quick
-163 rw auto
-165 rw auto quick
-169 rw auto quick migration
+163 rw
+165 rw quick
+169 rw quick migration
170 rw auto quick
171 rw auto quick
172 auto
@@ -180,71 +193,71 @@
175 auto quick
176 rw auto backing
177 rw auto quick
-178 auto
+178 img
179 rw auto quick
181 rw auto migration
-182 rw auto quick
-183 rw auto migration
+182 rw quick
+183 rw migration
184 rw auto quick
-185 rw auto
+185 rw
186 rw auto
187 rw auto
-188 rw auto quick
-189 rw auto
+188 rw quick
+189 rw
190 rw auto quick
191 rw auto
192 rw auto quick
-194 rw auto migration quick
+194 rw migration quick
195 rw auto quick
-196 rw auto quick migration
+196 rw quick migration
197 rw auto quick
-198 rw auto
-199 rw auto migration
-200 rw auto
+198 rw
+199 rw migration
+200 rw
201 rw auto migration
-202 rw auto quick
-203 rw auto migration
-204 rw auto quick
-205 rw auto quick
-206 rw auto
+202 rw quick
+203 rw migration
+204 rw quick
+205 rw quick
+206 rw
207 rw auto
-208 rw auto quick
-209 rw auto quick
+208 rw quick
+209 rw quick
210 rw auto
211 rw auto quick
212 rw auto quick
213 rw auto quick
214 rw auto
215 rw auto quick
-216 rw auto quick
+216 rw quick
217 rw auto quick
-218 rw auto quick
-219 rw auto
+218 rw quick
+219 rw
220 rw auto
221 rw auto quick
-222 rw auto quick
-223 rw auto quick
-224 rw auto quick
+222 rw quick
+223 rw quick
+224 rw quick
225 rw auto quick
226 auto quick
-227 auto quick
-228 rw auto quick
+227 quick
+228 rw quick
229 auto quick
231 auto quick
-232 auto quick
+232 quick
233 auto quick
-234 auto quick migration
-235 auto quick
-236 auto quick
+234 quick migration
+235 quick
+236 quick
237 rw auto quick
-238 auto quick
+238 quick
239 rw auto quick
-240 auto quick
+240 quick
241 rw auto quick
-242 rw auto quick
+242 rw quick
243 rw auto quick
244 rw auto quick
-245 rw auto
-246 rw auto quick
+245 rw
+246 rw quick
247 rw auto quick
-248 rw auto quick
+248 rw quick
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 7/8] tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
@ 2019-05-01 16:37 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 16:37 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> Currently, all tests are in the "auto" group. This is a little bit pointless.
> OTOH, we need a group for the tests that we can automatically run during
> "make check" each time, too. Tests in this new group are supposed to run
> with every possible QEMU configuration, for example they must run with every
> QEMU binary (also non-x86), without failing when an optional features
> is
I'm curious as to what tests fail on non-x86? I was under the naive
impression that at least for Linux all the file-system relevant bits
where fairly uniformly implemented.
> missing (but reporting "skip" is ok), and be able to run on all kind of host
> filesystems and users (i.e. also as "nobody" or "root").
> So let's use the "auto" group for this class of tests now. The initial
> list has been determined by running the iotests with non-x86 QEMU targets
> and with our CI pipelines on Gitlab, Cirrus-CI and Travis (i.e. including
> macOS and FreeBSD).
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/qemu-iotests/group | 169 +++++++++++++++++++++------------------
> 1 file changed, 91 insertions(+), 78 deletions(-)
>
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index bae7718380..4d0b6ae256 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -1,8 +1,21 @@
> #
> # QA groups control file
> # Defines test groups
> +#
> +# Some notes about the groups:
> +#
> # - do not start group names with a digit
> #
> +# - quick : Tests in this group should finish within some few seconds.
> +#
> +# - img : Tests in this group can be used to excercise the qemu-img tool.
> +#
> +# - auto : Tests in this group are used during "make check" and should be
> +# runnable in any case. That means they should run with every QEMU binary
> +# (also non-x86), with every QEMU configuration (i.e. must not fail if
> +# an optional feature is not compiled in - but reporting a "skip" is ok),
> +# and work all kind of host filesystems and users (e.g. "nobody" or "root").
> +#
>
> #
> # test-group association ... one line per test
> @@ -32,11 +45,11 @@
> 023 rw auto
> 024 rw backing auto quick
> 025 rw auto quick
> -026 rw blkdbg auto
> +026 rw blkdbg
> 027 rw auto quick
> 028 rw backing auto quick
028 failed on an armhf host for me.
> 029 rw auto quick
> -030 rw auto backing
> +030 rw backing
<snip>
> +245 rw
> +246 rw quick
> 247 rw auto quick
And 247
> -248 rw auto quick
> +248 rw quick
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 7/8] tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
@ 2019-05-01 16:37 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 16:37 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> Currently, all tests are in the "auto" group. This is a little bit pointless.
> OTOH, we need a group for the tests that we can automatically run during
> "make check" each time, too. Tests in this new group are supposed to run
> with every possible QEMU configuration, for example they must run with every
> QEMU binary (also non-x86), without failing when an optional features
> is
I'm curious as to what tests fail on non-x86? I was under the naive
impression that at least for Linux all the file-system relevant bits
where fairly uniformly implemented.
> missing (but reporting "skip" is ok), and be able to run on all kind of host
> filesystems and users (i.e. also as "nobody" or "root").
> So let's use the "auto" group for this class of tests now. The initial
> list has been determined by running the iotests with non-x86 QEMU targets
> and with our CI pipelines on Gitlab, Cirrus-CI and Travis (i.e. including
> macOS and FreeBSD).
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> tests/qemu-iotests/group | 169 +++++++++++++++++++++------------------
> 1 file changed, 91 insertions(+), 78 deletions(-)
>
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index bae7718380..4d0b6ae256 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -1,8 +1,21 @@
> #
> # QA groups control file
> # Defines test groups
> +#
> +# Some notes about the groups:
> +#
> # - do not start group names with a digit
> #
> +# - quick : Tests in this group should finish within some few seconds.
> +#
> +# - img : Tests in this group can be used to excercise the qemu-img tool.
> +#
> +# - auto : Tests in this group are used during "make check" and should be
> +# runnable in any case. That means they should run with every QEMU binary
> +# (also non-x86), with every QEMU configuration (i.e. must not fail if
> +# an optional feature is not compiled in - but reporting a "skip" is ok),
> +# and work all kind of host filesystems and users (e.g. "nobody" or "root").
> +#
>
> #
> # test-group association ... one line per test
> @@ -32,11 +45,11 @@
> 023 rw auto
> 024 rw backing auto quick
> 025 rw auto quick
> -026 rw blkdbg auto
> +026 rw blkdbg
> 027 rw auto quick
> 028 rw backing auto quick
028 failed on an armhf host for me.
> 029 rw auto quick
> -030 rw auto backing
> +030 rw backing
<snip>
> +245 rw
> +246 rw quick
> 247 rw auto quick
And 247
> -248 rw auto quick
> +248 rw quick
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 7/8] tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
@ 2019-05-02 5:44 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-05-02 5:44 UTC (permalink / raw)
To: Alex Bennée
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
On 01/05/2019 18.37, Alex Bennée wrote:
>
> Thomas Huth <thuth@redhat.com> writes:
>
>> Currently, all tests are in the "auto" group. This is a little bit pointless.
>> OTOH, we need a group for the tests that we can automatically run during
>> "make check" each time, too. Tests in this new group are supposed to run
>> with every possible QEMU configuration, for example they must run with every
>> QEMU binary (also non-x86), without failing when an optional features
>> is
>
> I'm curious as to what tests fail on non-x86? I was under the naive
> impression that at least for Linux all the file-system relevant bits
> where fairly uniformly implemented.
>
>> missing (but reporting "skip" is ok), and be able to run on all kind of host
>> filesystems and users (i.e. also as "nobody" or "root").
>> So let's use the "auto" group for this class of tests now. The initial
>> list has been determined by running the iotests with non-x86 QEMU targets
>> and with our CI pipelines on Gitlab, Cirrus-CI and Travis (i.e. including
>> macOS and FreeBSD).
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
>
>
>> ---
>> tests/qemu-iotests/group | 169 +++++++++++++++++++++------------------
>> 1 file changed, 91 insertions(+), 78 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
>> index bae7718380..4d0b6ae256 100644
>> --- a/tests/qemu-iotests/group
>> +++ b/tests/qemu-iotests/group
>> @@ -1,8 +1,21 @@
>> #
>> # QA groups control file
>> # Defines test groups
>> +#
>> +# Some notes about the groups:
>> +#
>> # - do not start group names with a digit
>> #
>> +# - quick : Tests in this group should finish within some few seconds.
>> +#
>> +# - img : Tests in this group can be used to excercise the qemu-img tool.
>> +#
>> +# - auto : Tests in this group are used during "make check" and should be
>> +# runnable in any case. That means they should run with every QEMU binary
>> +# (also non-x86), with every QEMU configuration (i.e. must not fail if
>> +# an optional feature is not compiled in - but reporting a "skip" is ok),
>> +# and work all kind of host filesystems and users (e.g. "nobody" or "root").
>> +#
>>
>> #
>> # test-group association ... one line per test
>> @@ -32,11 +45,11 @@
>> 023 rw auto
>> 024 rw backing auto quick
>> 025 rw auto quick
>> -026 rw blkdbg auto
>> +026 rw blkdbg
>> 027 rw auto quick
>> 028 rw backing auto quick
>
> 028 failed on an armhf host for me.
>
>> 029 rw auto quick
>> -030 rw auto backing
>> +030 rw backing
> <snip>
>> +245 rw
>> +246 rw quick
>> 247 rw auto quick
>
> And 247
Ok, thanks, I'll remove them in v3. (We still can investigate and enable
them later if we care).
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 7/8] tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
@ 2019-05-02 5:44 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-05-02 5:44 UTC (permalink / raw)
To: Alex Bennée
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
On 01/05/2019 18.37, Alex Bennée wrote:
>
> Thomas Huth <thuth@redhat.com> writes:
>
>> Currently, all tests are in the "auto" group. This is a little bit pointless.
>> OTOH, we need a group for the tests that we can automatically run during
>> "make check" each time, too. Tests in this new group are supposed to run
>> with every possible QEMU configuration, for example they must run with every
>> QEMU binary (also non-x86), without failing when an optional features
>> is
>
> I'm curious as to what tests fail on non-x86? I was under the naive
> impression that at least for Linux all the file-system relevant bits
> where fairly uniformly implemented.
>
>> missing (but reporting "skip" is ok), and be able to run on all kind of host
>> filesystems and users (i.e. also as "nobody" or "root").
>> So let's use the "auto" group for this class of tests now. The initial
>> list has been determined by running the iotests with non-x86 QEMU targets
>> and with our CI pipelines on Gitlab, Cirrus-CI and Travis (i.e. including
>> macOS and FreeBSD).
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
>
>
>> ---
>> tests/qemu-iotests/group | 169 +++++++++++++++++++++------------------
>> 1 file changed, 91 insertions(+), 78 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
>> index bae7718380..4d0b6ae256 100644
>> --- a/tests/qemu-iotests/group
>> +++ b/tests/qemu-iotests/group
>> @@ -1,8 +1,21 @@
>> #
>> # QA groups control file
>> # Defines test groups
>> +#
>> +# Some notes about the groups:
>> +#
>> # - do not start group names with a digit
>> #
>> +# - quick : Tests in this group should finish within some few seconds.
>> +#
>> +# - img : Tests in this group can be used to excercise the qemu-img tool.
>> +#
>> +# - auto : Tests in this group are used during "make check" and should be
>> +# runnable in any case. That means they should run with every QEMU binary
>> +# (also non-x86), with every QEMU configuration (i.e. must not fail if
>> +# an optional feature is not compiled in - but reporting a "skip" is ok),
>> +# and work all kind of host filesystems and users (e.g. "nobody" or "root").
>> +#
>>
>> #
>> # test-group association ... one line per test
>> @@ -32,11 +45,11 @@
>> 023 rw auto
>> 024 rw backing auto quick
>> 025 rw auto quick
>> -026 rw blkdbg auto
>> +026 rw blkdbg
>> 027 rw auto quick
>> 028 rw backing auto quick
>
> 028 failed on an armhf host for me.
>
>> 029 rw auto quick
>> -030 rw auto backing
>> +030 rw backing
> <snip>
>> +245 rw
>> +246 rw quick
>> 247 rw auto quick
>
> And 247
Ok, thanks, I'll remove them in v3. (We still can investigate and enable
them later if we care).
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread
* [Qemu-devel] [PATCH v2 8/8] tests: Run the iotests during "make check" again
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, qemu-block, Eric Blake, Ed Maste, Christophe Fergeau,
Kevin Wolf, Max Reitz, Li-Wen Hsu, Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster, Alex Bennée
People often forget to run the iotests before submitting patches or
pull requests - this is likely due to the fact that we do not run the
tests during our mandatory "make check" tests yet. Now that we've got
a proper "auto" group of iotests that should be fine to run in every
environment, we can enable the iotests during "make check" again by
running the "auto" tests by default from the check-block.sh script.
Some cases still need to be checked first, though: iotests need bash
and GNU sed (otherwise they fail), and if gprof is enabled, it spoils
the output of some test cases causing them to fail. So if we detect
that one of the required programs is missing or that gprof is enabled,
we still have to skip the iotests to avoid failures.
And finally, since we are using check-block.sh now again, this patch also
removes the qemu-iotests-quick.sh script since we do not need that anymore
(and having two shell wrapper scripts around the block tests seem
rather confusing than helpful).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/Makefile.include | 8 +++----
tests/check-block.sh | 44 ++++++++++++++++++++++++++++---------
tests/qemu-iotests-quick.sh | 8 -------
3 files changed, 38 insertions(+), 22 deletions(-)
delete mode 100755 tests/qemu-iotests-quick.sh
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e2432d5e77..3bb7793d4a 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -140,7 +140,7 @@ check-unit-y += tests/test-uuid$(EXESUF)
check-unit-y += tests/ptimer-test$(EXESUF)
check-unit-y += tests/test-qapi-util$(EXESUF)
-check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
+check-block-$(CONFIG_POSIX) += tests/check-block.sh
# All QTests for now are POSIX-only, but the dependencies are
# really in libqtest, not in the testcases themselves.
@@ -1096,8 +1096,8 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
-.PHONY: check-tests/qemu-iotests-quick.sh
-check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
+.PHONY: check-tests/check-block.sh
+check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
$<
.PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
@@ -1168,7 +1168,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi
check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
check-block: $(patsubst %,check-%, $(check-block-y))
-check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
+check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-block
check-clean:
rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
diff --git a/tests/check-block.sh b/tests/check-block.sh
index f3d12fd602..3b971d6cf4 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -1,24 +1,48 @@
#!/bin/sh
-FORMAT_LIST="raw qcow2 qed vmdk vpc"
+# Honor the SPEED environment variable, just like we do it for the qtests.
+if [ "$SPEED" = "slow" ]; then
+ format_list="raw qcow2"
+ group=
+elif [ "$SPEED" = "thorough" ]; then
+ format_list="raw qcow2 qed vmdk vpc"
+ group=
+else
+ format_list=qcow2
+ group="-g auto"
+fi
+
if [ "$#" -ne 0 ]; then
- FORMAT_LIST="$@"
+ format_list="$@"
+fi
+
+if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then
+ echo "GPROF is enabled ==> Not running the qemu-iotests."
+ exit 0
fi
-export QEMU_PROG="$PWD/x86_64-softmmu/qemu-system-x86_64"
-export QEMU_IMG_PROG="$PWD/qemu-img"
-export QEMU_IO_PROG="$PWD/qemu-io"
+if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
+ echo "No qemu-system binary available ==> Not running the qemu-iotests."
+ exit 0
+fi
+
+if ! command -v bash >/dev/null 2>&1 ; then
+ echo "bash not available ==> Not running the qemu-iotests."
+ exit 0
+fi
-if [ ! -x $QEMU_PROG ]; then
- echo "'make check-block' requires qemu-system-x86_64"
- exit 1
+if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
+ if ! command -v gsed >/dev/null 2>&1; then
+ echo "GNU sed not available ==> Not running the qemu-iotests."
+ exit 0
+ fi
fi
cd tests/qemu-iotests
ret=0
-for FMT in $FORMAT_LIST ; do
- ./check -T -nocache -$FMT || ret=1
+for fmt in $format_list ; do
+ ./check -$fmt $group || ret=1
done
exit $ret
diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
deleted file mode 100755
index 0e554bb972..0000000000
--- a/tests/qemu-iotests-quick.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cd tests/qemu-iotests
-
-ret=0
-TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
-
-exit $ret
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread* [Qemu-devel] [PATCH v2 8/8] tests: Run the iotests during "make check" again
@ 2019-04-28 15:54 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-28 15:54 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
Markus Armbruster, Christophe Fergeau, Max Reitz,
Alex Bennée, Wainer dos Santos Moschetta, Li-Wen Hsu
People often forget to run the iotests before submitting patches or
pull requests - this is likely due to the fact that we do not run the
tests during our mandatory "make check" tests yet. Now that we've got
a proper "auto" group of iotests that should be fine to run in every
environment, we can enable the iotests during "make check" again by
running the "auto" tests by default from the check-block.sh script.
Some cases still need to be checked first, though: iotests need bash
and GNU sed (otherwise they fail), and if gprof is enabled, it spoils
the output of some test cases causing them to fail. So if we detect
that one of the required programs is missing or that gprof is enabled,
we still have to skip the iotests to avoid failures.
And finally, since we are using check-block.sh now again, this patch also
removes the qemu-iotests-quick.sh script since we do not need that anymore
(and having two shell wrapper scripts around the block tests seem
rather confusing than helpful).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/Makefile.include | 8 +++----
tests/check-block.sh | 44 ++++++++++++++++++++++++++++---------
tests/qemu-iotests-quick.sh | 8 -------
3 files changed, 38 insertions(+), 22 deletions(-)
delete mode 100755 tests/qemu-iotests-quick.sh
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e2432d5e77..3bb7793d4a 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -140,7 +140,7 @@ check-unit-y += tests/test-uuid$(EXESUF)
check-unit-y += tests/ptimer-test$(EXESUF)
check-unit-y += tests/test-qapi-util$(EXESUF)
-check-block-$(CONFIG_POSIX) += tests/qemu-iotests-quick.sh
+check-block-$(CONFIG_POSIX) += tests/check-block.sh
# All QTests for now are POSIX-only, but the dependencies are
# really in libqtest, not in the testcases themselves.
@@ -1096,8 +1096,8 @@ clean-tcg: $(CLEAN_TCG_TARGET_RULES)
QEMU_IOTESTS_HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
-.PHONY: check-tests/qemu-iotests-quick.sh
-check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
+.PHONY: check-tests/check-block.sh
+check-tests/check-block.sh: tests/check-block.sh qemu-img$(EXESUF) qemu-io$(EXESUF) qemu-nbd$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
$<
.PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
@@ -1168,7 +1168,7 @@ check-acceptance: check-venv $(TESTS_RESULTS_DIR)
check-qapi-schema: $(patsubst %,check-%, $(check-qapi-schema-y)) check-tests/qapi-schema/doc-good.texi
check-qtest: $(patsubst %,check-qtest-%, $(QTEST_TARGETS))
check-block: $(patsubst %,check-%, $(check-block-y))
-check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree
+check: check-qapi-schema check-unit check-softfloat check-qtest check-decodetree check-block
check-clean:
rm -rf $(check-unit-y) tests/*.o $(QEMU_IOTESTS_HELPERS-y)
rm -rf $(sort $(foreach target,$(SYSEMU_TARGET_LIST), $(check-qtest-$(target)-y)) $(check-qtest-generic-y))
diff --git a/tests/check-block.sh b/tests/check-block.sh
index f3d12fd602..3b971d6cf4 100755
--- a/tests/check-block.sh
+++ b/tests/check-block.sh
@@ -1,24 +1,48 @@
#!/bin/sh
-FORMAT_LIST="raw qcow2 qed vmdk vpc"
+# Honor the SPEED environment variable, just like we do it for the qtests.
+if [ "$SPEED" = "slow" ]; then
+ format_list="raw qcow2"
+ group=
+elif [ "$SPEED" = "thorough" ]; then
+ format_list="raw qcow2 qed vmdk vpc"
+ group=
+else
+ format_list=qcow2
+ group="-g auto"
+fi
+
if [ "$#" -ne 0 ]; then
- FORMAT_LIST="$@"
+ format_list="$@"
+fi
+
+if grep -q "TARGET_GPROF=y" *-softmmu/config-target.mak 2>/dev/null ; then
+ echo "GPROF is enabled ==> Not running the qemu-iotests."
+ exit 0
fi
-export QEMU_PROG="$PWD/x86_64-softmmu/qemu-system-x86_64"
-export QEMU_IMG_PROG="$PWD/qemu-img"
-export QEMU_IO_PROG="$PWD/qemu-io"
+if [ -z "$(find . -name 'qemu-system-*' -print)" ]; then
+ echo "No qemu-system binary available ==> Not running the qemu-iotests."
+ exit 0
+fi
+
+if ! command -v bash >/dev/null 2>&1 ; then
+ echo "bash not available ==> Not running the qemu-iotests."
+ exit 0
+fi
-if [ ! -x $QEMU_PROG ]; then
- echo "'make check-block' requires qemu-system-x86_64"
- exit 1
+if ! (sed --version | grep 'GNU sed') > /dev/null 2>&1 ; then
+ if ! command -v gsed >/dev/null 2>&1; then
+ echo "GNU sed not available ==> Not running the qemu-iotests."
+ exit 0
+ fi
fi
cd tests/qemu-iotests
ret=0
-for FMT in $FORMAT_LIST ; do
- ./check -T -nocache -$FMT || ret=1
+for fmt in $format_list ; do
+ ./check -$fmt $group || ret=1
done
exit $ret
diff --git a/tests/qemu-iotests-quick.sh b/tests/qemu-iotests-quick.sh
deleted file mode 100755
index 0e554bb972..0000000000
--- a/tests/qemu-iotests-quick.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-cd tests/qemu-iotests
-
-ret=0
-TEST_DIR=${TEST_DIR:-/tmp/qemu-iotests-quick-$$} ./check -T -qcow2 -g quick || ret=1
-
-exit $ret
--
2.21.0
^ permalink raw reply related [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-28 16:10 ` no-reply
0 siblings, 0 replies; 62+ messages in thread
From: no-reply @ 2019-04-28 16:10 UTC (permalink / raw)
To: thuth; +Cc: fam, qemu-devel
Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190428155451.15653-1-thuth@redhat.com
Subject: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/20190428155451.15653-1-thuth@redhat.com -> patchew/20190428155451.15653-1-thuth@redhat.com
Switched to a new branch 'test'
7bb09e08a3 tests: Run the iotests during "make check" again
3d905a091e tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
565003ac8a tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests
fb27dba3d9 cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
02ac8a4bf6 tests/qemu-iotests: Do not hard-code the path to bash
34c6a891ea tests/qemu-iotests/check: Pick a default machine if necessary
d091edf7c1 tests/qemu-iotests/005: Add a sanity check for large sparse file support
3cf4caa193 tests/qemu-iotests: Fix output of qemu-io related tests
=== OUTPUT BEGIN ===
1/8 Checking commit 3cf4caa193cc (tests/qemu-iotests: Fix output of qemu-io related tests)
2/8 Checking commit d091edf7c1ef (tests/qemu-iotests/005: Add a sanity check for large sparse file support)
3/8 Checking commit 34c6a891ea6e (tests/qemu-iotests/check: Pick a default machine if necessary)
4/8 Checking commit 02ac8a4bf608 (tests/qemu-iotests: Do not hard-code the path to bash)
5/8 Checking commit fb27dba3d9f0 (cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD)
6/8 Checking commit 565003ac8a70 (tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests)
7/8 Checking commit 3d905a091e64 (tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run)
ERROR: trailing whitespace
#125: FILE: tests/qemu-iotests/group:115:
+093 $
total: 1 errors, 0 warnings, 294 lines checked
Patch 7/8 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/8 Checking commit 7bb09e08a3b1 (tests: Run the iotests during "make check" again)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#126:
deleted file mode 100755
total: 0 errors, 1 warnings, 85 lines checked
Patch 8/8 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-28 16:10 ` no-reply
0 siblings, 0 replies; 62+ messages in thread
From: no-reply @ 2019-04-28 16:10 UTC (permalink / raw)
To: thuth
Cc: fam, kwolf, emaste, qemu-block, alex.bennee, qemu-devel,
cfergeau, armbru, wainersm, mreitz, philmd, lwhsu
Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Type: series
Message-id: 20190428155451.15653-1-thuth@redhat.com
Subject: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
From https://github.com/patchew-project/qemu
* [new tag] patchew/20190428155451.15653-1-thuth@redhat.com -> patchew/20190428155451.15653-1-thuth@redhat.com
Switched to a new branch 'test'
7bb09e08a3 tests: Run the iotests during "make check" again
3d905a091e tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
565003ac8a tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests
fb27dba3d9 cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
02ac8a4bf6 tests/qemu-iotests: Do not hard-code the path to bash
34c6a891ea tests/qemu-iotests/check: Pick a default machine if necessary
d091edf7c1 tests/qemu-iotests/005: Add a sanity check for large sparse file support
3cf4caa193 tests/qemu-iotests: Fix output of qemu-io related tests
=== OUTPUT BEGIN ===
1/8 Checking commit 3cf4caa193cc (tests/qemu-iotests: Fix output of qemu-io related tests)
2/8 Checking commit d091edf7c1ef (tests/qemu-iotests/005: Add a sanity check for large sparse file support)
3/8 Checking commit 34c6a891ea6e (tests/qemu-iotests/check: Pick a default machine if necessary)
4/8 Checking commit 02ac8a4bf608 (tests/qemu-iotests: Do not hard-code the path to bash)
5/8 Checking commit fb27dba3d9f0 (cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD)
6/8 Checking commit 565003ac8a70 (tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests)
7/8 Checking commit 3d905a091e64 (tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run)
ERROR: trailing whitespace
#125: FILE: tests/qemu-iotests/group:115:
+093 $
total: 1 errors, 0 warnings, 294 lines checked
Patch 7/8 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
8/8 Checking commit 7bb09e08a3b1 (tests: Run the iotests during "make check" again)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#126:
deleted file mode 100755
total: 0 errors, 1 warnings, 85 lines checked
Patch 8/8 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-29 5:25 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-29 5:25 UTC (permalink / raw)
To: qemu-devel
Cc: fam, kwolf, emaste, qemu-block, philmd, armbru, cfergeau, mreitz,
alex.bennee, wainersm, lwhsu
On 28/04/2019 18.10, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
>
>
>
> Hi,
>
> This series seems to have some coding style problems. See output below for
> more information:
>
> Type: series
> Message-id: 20190428155451.15653-1-thuth@redhat.com
> Subject: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
>
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> git rev-parse base > /dev/null || exit 0
> git config --local diff.renamelimit 0
> git config --local diff.renames True
> git config --local diff.algorithm histogram
> ./scripts/checkpatch.pl --mailback base..
> === TEST SCRIPT END ===
>
> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> From https://github.com/patchew-project/qemu
> * [new tag] patchew/20190428155451.15653-1-thuth@redhat.com -> patchew/20190428155451.15653-1-thuth@redhat.com
> Switched to a new branch 'test'
> 7bb09e08a3 tests: Run the iotests during "make check" again
> 3d905a091e tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
> 565003ac8a tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests
> fb27dba3d9 cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
> 02ac8a4bf6 tests/qemu-iotests: Do not hard-code the path to bash
> 34c6a891ea tests/qemu-iotests/check: Pick a default machine if necessary
> d091edf7c1 tests/qemu-iotests/005: Add a sanity check for large sparse file support
> 3cf4caa193 tests/qemu-iotests: Fix output of qemu-io related tests
>
> === OUTPUT BEGIN ===
> 1/8 Checking commit 3cf4caa193cc (tests/qemu-iotests: Fix output of qemu-io related tests)
> 2/8 Checking commit d091edf7c1ef (tests/qemu-iotests/005: Add a sanity check for large sparse file support)
> 3/8 Checking commit 34c6a891ea6e (tests/qemu-iotests/check: Pick a default machine if necessary)
> 4/8 Checking commit 02ac8a4bf608 (tests/qemu-iotests: Do not hard-code the path to bash)
> 5/8 Checking commit fb27dba3d9f0 (cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD)
> 6/8 Checking commit 565003ac8a70 (tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests)
> 7/8 Checking commit 3d905a091e64 (tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run)
> ERROR: trailing whitespace
> #125: FILE: tests/qemu-iotests/group:115:
> +093 $
Not an error: The trailing whitespace is currently required for the
parsing code in the "check" script.
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-29 5:25 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-29 5:25 UTC (permalink / raw)
To: qemu-devel
Cc: fam, kwolf, emaste, qemu-block, alex.bennee, armbru, cfergeau,
mreitz, wainersm, philmd, lwhsu
On 28/04/2019 18.10, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
>
>
>
> Hi,
>
> This series seems to have some coding style problems. See output below for
> more information:
>
> Type: series
> Message-id: 20190428155451.15653-1-thuth@redhat.com
> Subject: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
>
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> git rev-parse base > /dev/null || exit 0
> git config --local diff.renamelimit 0
> git config --local diff.renames True
> git config --local diff.algorithm histogram
> ./scripts/checkpatch.pl --mailback base..
> === TEST SCRIPT END ===
>
> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> From https://github.com/patchew-project/qemu
> * [new tag] patchew/20190428155451.15653-1-thuth@redhat.com -> patchew/20190428155451.15653-1-thuth@redhat.com
> Switched to a new branch 'test'
> 7bb09e08a3 tests: Run the iotests during "make check" again
> 3d905a091e tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run
> 565003ac8a tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests
> fb27dba3d9 cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
> 02ac8a4bf6 tests/qemu-iotests: Do not hard-code the path to bash
> 34c6a891ea tests/qemu-iotests/check: Pick a default machine if necessary
> d091edf7c1 tests/qemu-iotests/005: Add a sanity check for large sparse file support
> 3cf4caa193 tests/qemu-iotests: Fix output of qemu-io related tests
>
> === OUTPUT BEGIN ===
> 1/8 Checking commit 3cf4caa193cc (tests/qemu-iotests: Fix output of qemu-io related tests)
> 2/8 Checking commit d091edf7c1ef (tests/qemu-iotests/005: Add a sanity check for large sparse file support)
> 3/8 Checking commit 34c6a891ea6e (tests/qemu-iotests/check: Pick a default machine if necessary)
> 4/8 Checking commit 02ac8a4bf608 (tests/qemu-iotests: Do not hard-code the path to bash)
> 5/8 Checking commit fb27dba3d9f0 (cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD)
> 6/8 Checking commit 565003ac8a70 (tests/qemu-iotests: Remove the "_supported_os Linux" line from many tests)
> 7/8 Checking commit 3d905a091e64 (tests/qemu-iotests/group: Re-use the "auto" group for tests that can always run)
> ERROR: trailing whitespace
> #125: FILE: tests/qemu-iotests/group:115:
> +093 $
Not an error: The trailing whitespace is currently required for the
parsing code in the "check" script.
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-29 3:47 ` no-reply
0 siblings, 0 replies; 62+ messages in thread
From: no-reply @ 2019-04-29 3:47 UTC (permalink / raw)
To: thuth; +Cc: fam, qemu-devel
Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
Hi,
This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-29 3:47 ` no-reply
0 siblings, 0 replies; 62+ messages in thread
From: no-reply @ 2019-04-29 3:47 UTC (permalink / raw)
To: thuth
Cc: fam, kwolf, emaste, qemu-block, alex.bennee, qemu-devel,
cfergeau, armbru, wainersm, mreitz, philmd, lwhsu
Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
Hi,
This series failed the asan build test. Please find the testing commands and
their output below. If you have Docker installed, you can probably reproduce it
locally.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
=== TEST SCRIPT END ===
The full log is available at
http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.asan/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-29 5:30 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-29 5:30 UTC (permalink / raw)
To: qemu-devel
Cc: fam, kwolf, emaste, qemu-block, philmd, armbru, cfergeau, mreitz,
alex.bennee, wainersm, lwhsu
On 29/04/2019 05.47, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
>
> This series failed the asan build test. Please find the testing commands and
> their output below. If you have Docker installed, you can probably reproduce it
> locally.
>
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
> === TEST SCRIPT END ===
>
> The full log is available at
> http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.asan/?type=message.
The asan test failed since it could not check out the repository ...
a networking problem?
Anyway, looks like there was a real bug here:
https://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.docker-clang@ubuntu/?type=message
Test 162 failed with:
162 - output mismatch (see 162.out.bad)
--- /tmp/qemu-test/src/tests/qemu-iotests/162.out 2019-04-28 16:09:31.000000000 +0000
+++ /tmp/qemu-test/build/tests/qemu-iotests/162.out.bad 2019-04-28 16:24:21.669646149 +0000
@@ -6,7 +6,9 @@
image: nbd+unix://?socket=42
=== SSH ===
+qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": "0", "path": "/foo"}': Failed to connect socket: Connection refused
+qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
qemu-img: Could not open 'driver=ssh,host=localhost,port=0,path=/foo': Failed to connect socket: Connection refused
qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": 0.42, "path": "/foo"}': Parameter 'port' expects a number
qemu-img: Could not open 'driver=ssh,host=localhost,port=0.42,path=/foo': Parameter 'port' expects a number
... I think I'll remove 162 from the "auto" group to avoid this.
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-04-29 5:30 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-04-29 5:30 UTC (permalink / raw)
To: qemu-devel
Cc: fam, kwolf, emaste, qemu-block, alex.bennee, armbru, cfergeau,
mreitz, wainersm, philmd, lwhsu
On 29/04/2019 05.47, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
>
> This series failed the asan build test. Please find the testing commands and
> their output below. If you have Docker installed, you can probably reproduce it
> locally.
>
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
> === TEST SCRIPT END ===
>
> The full log is available at
> http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.asan/?type=message.
The asan test failed since it could not check out the repository ...
a networking problem?
Anyway, looks like there was a real bug here:
https://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.docker-clang@ubuntu/?type=message
Test 162 failed with:
162 - output mismatch (see 162.out.bad)
--- /tmp/qemu-test/src/tests/qemu-iotests/162.out 2019-04-28 16:09:31.000000000 +0000
+++ /tmp/qemu-test/build/tests/qemu-iotests/162.out.bad 2019-04-28 16:24:21.669646149 +0000
@@ -6,7 +6,9 @@
image: nbd+unix://?socket=42
=== SSH ===
+qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": "0", "path": "/foo"}': Failed to connect socket: Connection refused
+qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
qemu-img: Could not open 'driver=ssh,host=localhost,port=0,path=/foo': Failed to connect socket: Connection refused
qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": 0.42, "path": "/foo"}': Parameter 'port' expects a number
qemu-img: Could not open 'driver=ssh,host=localhost,port=0.42,path=/foo': Parameter 'port' expects a number
... I think I'll remove 162 from the "auto" group to avoid this.
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-05-01 8:30 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 8:30 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, fam, kwolf, emaste, qemu-block, philmd, armbru,
cfergeau, mreitz, wainersm, lwhsu
Thomas Huth <thuth@redhat.com> writes:
> On 29/04/2019 05.47, no-reply@patchew.org wrote:
>> Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
>>
>> This series failed the asan build test. Please find the testing commands and
>> their output below. If you have Docker installed, you can probably reproduce it
>> locally.
>>
>> === TEST SCRIPT BEGIN ===
>> #!/bin/bash
>> time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
>> === TEST SCRIPT END ===
>>
>> The full log is available at
>> http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.asan/?type=message.
>
> The asan test failed since it could not check out the repository ...
> a networking problem?
>
> Anyway, looks like there was a real bug here:
>
> https://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.docker-clang@ubuntu/?type=message
>
> Test 162 failed with:
>
> 162 - output mismatch (see 162.out.bad)
> --- /tmp/qemu-test/src/tests/qemu-iotests/162.out 2019-04-28 16:09:31.000000000 +0000
> +++ /tmp/qemu-test/build/tests/qemu-iotests/162.out.bad 2019-04-28 16:24:21.669646149 +0000
> @@ -6,7 +6,9 @@
> image: nbd+unix://?socket=42
>
> === SSH ===
> +qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
> qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": "0", "path": "/foo"}': Failed to connect socket: Connection refused
> +qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
> qemu-img: Could not open 'driver=ssh,host=localhost,port=0,path=/foo': Failed to connect socket: Connection refused
> qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": 0.42, "path": "/foo"}': Parameter 'port' expects a number
> qemu-img: Could not open 'driver=ssh,host=localhost,port=0.42,path=/foo': Parameter 'port' expects a number
>
> ... I think I'll remove 162 from the "auto" group to avoid this.
Should I wait for a v3 then?
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-05-01 8:30 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 8:30 UTC (permalink / raw)
To: Thomas Huth
Cc: fam, kwolf, emaste, qemu-block, qemu-devel, cfergeau, armbru,
wainersm, mreitz, philmd, lwhsu
Thomas Huth <thuth@redhat.com> writes:
> On 29/04/2019 05.47, no-reply@patchew.org wrote:
>> Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
>>
>> This series failed the asan build test. Please find the testing commands and
>> their output below. If you have Docker installed, you can probably reproduce it
>> locally.
>>
>> === TEST SCRIPT BEGIN ===
>> #!/bin/bash
>> time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
>> === TEST SCRIPT END ===
>>
>> The full log is available at
>> http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.asan/?type=message.
>
> The asan test failed since it could not check out the repository ...
> a networking problem?
>
> Anyway, looks like there was a real bug here:
>
> https://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.docker-clang@ubuntu/?type=message
>
> Test 162 failed with:
>
> 162 - output mismatch (see 162.out.bad)
> --- /tmp/qemu-test/src/tests/qemu-iotests/162.out 2019-04-28 16:09:31.000000000 +0000
> +++ /tmp/qemu-test/build/tests/qemu-iotests/162.out.bad 2019-04-28 16:24:21.669646149 +0000
> @@ -6,7 +6,9 @@
> image: nbd+unix://?socket=42
>
> === SSH ===
> +qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
> qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": "0", "path": "/foo"}': Failed to connect socket: Connection refused
> +qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
> qemu-img: Could not open 'driver=ssh,host=localhost,port=0,path=/foo': Failed to connect socket: Connection refused
> qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": 0.42, "path": "/foo"}': Parameter 'port' expects a number
> qemu-img: Could not open 'driver=ssh,host=localhost,port=0.42,path=/foo': Parameter 'port' expects a number
>
> ... I think I'll remove 162 from the "auto" group to avoid this.
Should I wait for a v3 then?
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-05-01 10:04 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-05-01 10:04 UTC (permalink / raw)
To: Alex Bennée
Cc: qemu-devel, fam, kwolf, emaste, qemu-block, philmd, armbru,
cfergeau, mreitz, wainersm, lwhsu
On 01/05/2019 10.30, Alex Bennée wrote:
>
> Thomas Huth <thuth@redhat.com> writes:
>
>> On 29/04/2019 05.47, no-reply@patchew.org wrote:
>>> Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
>>>
>>> This series failed the asan build test. Please find the testing commands and
>>> their output below. If you have Docker installed, you can probably reproduce it
>>> locally.
>>>
>>> === TEST SCRIPT BEGIN ===
>>> #!/bin/bash
>>> time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
>>> === TEST SCRIPT END ===
>>>
>>> The full log is available at
>>> http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.asan/?type=message.
>>
>> The asan test failed since it could not check out the repository ...
>> a networking problem?
>>
>> Anyway, looks like there was a real bug here:
>>
>> https://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.docker-clang@ubuntu/?type=message
>>
>> Test 162 failed with:
>>
>> 162 - output mismatch (see 162.out.bad)
>> --- /tmp/qemu-test/src/tests/qemu-iotests/162.out 2019-04-28 16:09:31.000000000 +0000
>> +++ /tmp/qemu-test/build/tests/qemu-iotests/162.out.bad 2019-04-28 16:24:21.669646149 +0000
>> @@ -6,7 +6,9 @@
>> image: nbd+unix://?socket=42
>>
>> === SSH ===
>> +qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
>> qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": "0", "path": "/foo"}': Failed to connect socket: Connection refused
>> +qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
>> qemu-img: Could not open 'driver=ssh,host=localhost,port=0,path=/foo': Failed to connect socket: Connection refused
>> qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": 0.42, "path": "/foo"}': Parameter 'port' expects a number
>> qemu-img: Could not open 'driver=ssh,host=localhost,port=0.42,path=/foo': Parameter 'port' expects a number
>>
>> ... I think I'll remove 162 from the "auto" group to avoid this.
>
> Should I wait for a v3 then?
Yes, I've got to respin anyway since there is a conflict with the new
iotest 249.
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-05-01 10:04 ` Thomas Huth
0 siblings, 0 replies; 62+ messages in thread
From: Thomas Huth @ 2019-05-01 10:04 UTC (permalink / raw)
To: Alex Bennée
Cc: fam, kwolf, emaste, qemu-block, qemu-devel, cfergeau, armbru,
wainersm, mreitz, philmd, lwhsu
On 01/05/2019 10.30, Alex Bennée wrote:
>
> Thomas Huth <thuth@redhat.com> writes:
>
>> On 29/04/2019 05.47, no-reply@patchew.org wrote:
>>> Patchew URL: https://patchew.org/QEMU/20190428155451.15653-1-thuth@redhat.com/
>>>
>>> This series failed the asan build test. Please find the testing commands and
>>> their output below. If you have Docker installed, you can probably reproduce it
>>> locally.
>>>
>>> === TEST SCRIPT BEGIN ===
>>> #!/bin/bash
>>> time make docker-test-debug@fedora TARGET_LIST=x86_64-softmmu J=14 NETWORK=1
>>> === TEST SCRIPT END ===
>>>
>>> The full log is available at
>>> http://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.asan/?type=message.
>>
>> The asan test failed since it could not check out the repository ...
>> a networking problem?
>>
>> Anyway, looks like there was a real bug here:
>>
>> https://patchew.org/logs/20190428155451.15653-1-thuth@redhat.com/testing.docker-clang@ubuntu/?type=message
>>
>> Test 162 failed with:
>>
>> 162 - output mismatch (see 162.out.bad)
>> --- /tmp/qemu-test/src/tests/qemu-iotests/162.out 2019-04-28 16:09:31.000000000 +0000
>> +++ /tmp/qemu-test/build/tests/qemu-iotests/162.out.bad 2019-04-28 16:24:21.669646149 +0000
>> @@ -6,7 +6,9 @@
>> image: nbd+unix://?socket=42
>>
>> === SSH ===
>> +qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
>> qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": "0", "path": "/foo"}': Failed to connect socket: Connection refused
>> +qemu-img: warning: GLib: getpwuid_r(): failed due to unknown user id (1003)
>> qemu-img: Could not open 'driver=ssh,host=localhost,port=0,path=/foo': Failed to connect socket: Connection refused
>> qemu-img: Could not open 'json:{"driver": "ssh", "host": "localhost", "port": 0.42, "path": "/foo"}': Parameter 'port' expects a number
>> qemu-img: Could not open 'driver=ssh,host=localhost,port=0.42,path=/foo': Parameter 'port' expects a number
>>
>> ... I think I'll remove 162 from the "auto" group to avoid this.
>
> Should I wait for a v3 then?
Yes, I've got to respin anyway since there is a conflict with the new
iotest 249.
Thomas
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-05-01 8:30 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 8:30 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-devel, Fam Zheng, qemu-block, Eric Blake, Ed Maste,
Christophe Fergeau, Kevin Wolf, Max Reitz, Li-Wen Hsu,
Philippe Mathieu-Daudé,
Wainer dos Santos Moschetta, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> People often forget to run the iotests before submitting patches or
> pull requests - this is likely due to the fact that we do not run the
> tests during our mandatory "make check" tests yet.
> This patch series now changes the "auto" group to only include tests
> that should be safe to run in all CI environments (including FreeBSD
> and macOS!). Thus these iotests can now always be run during "make
> check" automatically, too.
Assuming my local tests work I think I should queue these and submit a
PR right away. Sorry about the delay getting to them.
>
> v2:
> - Use "auto" group instead of adding a new "ci" group
> - Adjusted the tests that are run automatically (after doing lots
> of CI runs on cirrus-ci.com, gitlab and travis)
> - Added patch to fix the current regression with the "qemu-io:"
> prefix in the master branch
> - Added a fix for iotest 005 on ext4 filesystems (skip it there)
>
> Thomas Huth (8):
> tests/qemu-iotests: Fix output of qemu-io related tests
> tests/qemu-iotests/005: Add a sanity check for large sparse file
> support
> tests/qemu-iotests/check: Pick a default machine if necessary
> tests/qemu-iotests: Do not hard-code the path to bash
> cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
> tests/qemu-iotests: Remove the "_supported_os Linux" line from many
> tests
> tests/qemu-iotests/group: Re-use the "auto" group for tests that can
> always run
> tests: Run the iotests during "make check" again
>
> .cirrus.yml | 4 +-
> .travis.yml | 1 +
> tests/Makefile.include | 8 +-
> tests/check-block.sh | 44 +++++++---
> tests/qemu-iotests-quick.sh | 8 --
> tests/qemu-iotests/001 | 1 -
> tests/qemu-iotests/002 | 1 -
> tests/qemu-iotests/003 | 1 -
> tests/qemu-iotests/004 | 1 -
> tests/qemu-iotests/005 | 9 ++
> tests/qemu-iotests/007 | 1 -
> tests/qemu-iotests/008 | 1 -
> tests/qemu-iotests/009 | 1 -
> tests/qemu-iotests/010 | 1 -
> tests/qemu-iotests/011 | 1 -
> tests/qemu-iotests/012 | 1 -
> tests/qemu-iotests/015 | 1 -
> tests/qemu-iotests/017 | 1 -
> tests/qemu-iotests/020 | 1 -
> tests/qemu-iotests/021 | 1 -
> tests/qemu-iotests/022 | 1 -
> tests/qemu-iotests/025 | 1 -
> tests/qemu-iotests/026 | 1 -
> tests/qemu-iotests/026.out | 168 +++++++++++++++++------------------
> tests/qemu-iotests/027 | 1 -
> tests/qemu-iotests/029 | 1 -
> tests/qemu-iotests/031 | 1 -
> tests/qemu-iotests/032 | 1 -
> tests/qemu-iotests/033 | 1 -
> tests/qemu-iotests/035 | 1 -
> tests/qemu-iotests/036 | 1 -
> tests/qemu-iotests/037 | 1 -
> tests/qemu-iotests/042 | 1 -
> tests/qemu-iotests/043 | 1 -
> tests/qemu-iotests/046 | 1 -
> tests/qemu-iotests/047 | 1 -
> tests/qemu-iotests/049 | 1 -
> tests/qemu-iotests/050 | 1 -
> tests/qemu-iotests/051 | 1 -
> tests/qemu-iotests/052 | 1 -
> tests/qemu-iotests/053 | 1 -
> tests/qemu-iotests/054 | 1 -
> tests/qemu-iotests/060.out | 6 +-
> tests/qemu-iotests/062 | 1 -
> tests/qemu-iotests/063 | 1 -
> tests/qemu-iotests/066 | 1 -
> tests/qemu-iotests/067 | 1 -
> tests/qemu-iotests/068 | 1 -
> tests/qemu-iotests/069 | 1 -
> tests/qemu-iotests/069.out | 2 +-
> tests/qemu-iotests/070.out | 2 +-
> tests/qemu-iotests/071 | 1 -
> tests/qemu-iotests/072 | 1 -
> tests/qemu-iotests/073 | 1 -
> tests/qemu-iotests/075.out | 14 +--
> tests/qemu-iotests/076.out | 6 +-
> tests/qemu-iotests/078.out | 12 +--
> tests/qemu-iotests/079 | 1 -
> tests/qemu-iotests/080.out | 40 ++++-----
> tests/qemu-iotests/081.out | 2 +-
> tests/qemu-iotests/082 | 1 -
> tests/qemu-iotests/085 | 1 -
> tests/qemu-iotests/088.out | 12 +--
> tests/qemu-iotests/089 | 1 -
> tests/qemu-iotests/090 | 1 -
> tests/qemu-iotests/094 | 1 -
> tests/qemu-iotests/095 | 1 -
> tests/qemu-iotests/098 | 1 -
> tests/qemu-iotests/102 | 1 -
> tests/qemu-iotests/103 | 1 -
> tests/qemu-iotests/103.out | 14 +--
> tests/qemu-iotests/104 | 1 -
> tests/qemu-iotests/105 | 1 -
> tests/qemu-iotests/107 | 1 -
> tests/qemu-iotests/110 | 1 -
> tests/qemu-iotests/111 | 1 -
> tests/qemu-iotests/112 | 1 -
> tests/qemu-iotests/114 | 1 -
> tests/qemu-iotests/114.out | 2 +-
> tests/qemu-iotests/115 | 1 -
> tests/qemu-iotests/116.out | 14 +--
> tests/qemu-iotests/117 | 1 -
> tests/qemu-iotests/120 | 1 -
> tests/qemu-iotests/125 | 1 -
> tests/qemu-iotests/126 | 1 -
> tests/qemu-iotests/127 | 1 -
> tests/qemu-iotests/131.out | 2 +-
> tests/qemu-iotests/133 | 1 -
> tests/qemu-iotests/133.out | 30 +++----
> tests/qemu-iotests/134 | 1 -
> tests/qemu-iotests/137.out | 28 +++---
> tests/qemu-iotests/140.out | 2 +-
> tests/qemu-iotests/142 | 1 -
> tests/qemu-iotests/143 | 1 -
> tests/qemu-iotests/143.out | 2 +-
> tests/qemu-iotests/144 | 1 -
> tests/qemu-iotests/145 | 1 -
> tests/qemu-iotests/153 | 1 -
> tests/qemu-iotests/153.out | 30 +++----
> tests/qemu-iotests/156 | 1 -
> tests/qemu-iotests/157 | 1 -
> tests/qemu-iotests/158 | 1 -
> tests/qemu-iotests/159 | 1 -
> tests/qemu-iotests/162 | 1 -
> tests/qemu-iotests/170 | 1 -
> tests/qemu-iotests/173 | 1 -
> tests/qemu-iotests/182 | 1 -
> tests/qemu-iotests/183 | 1 -
> tests/qemu-iotests/186 | 1 -
> tests/qemu-iotests/187 | 1 -
> tests/qemu-iotests/187.out | 6 +-
> tests/qemu-iotests/188.out | 2 +-
> tests/qemu-iotests/190 | 1 -
> tests/qemu-iotests/191 | 1 -
> tests/qemu-iotests/192 | 1 -
> tests/qemu-iotests/195 | 1 -
> tests/qemu-iotests/197 | 1 -
> tests/qemu-iotests/197.out | 2 +-
> tests/qemu-iotests/200 | 1 -
> tests/qemu-iotests/205 | 2 +-
> tests/qemu-iotests/214 | 1 -
> tests/qemu-iotests/215 | 1 -
> tests/qemu-iotests/215.out | 2 +-
> tests/qemu-iotests/217 | 1 -
> tests/qemu-iotests/226.out | 16 ++--
> tests/qemu-iotests/227 | 1 -
> tests/qemu-iotests/231 | 1 -
> tests/qemu-iotests/233 | 1 -
> tests/qemu-iotests/239 | 2 +-
> tests/qemu-iotests/240 | 3 +-
> tests/qemu-iotests/241 | 2 +-
> tests/qemu-iotests/243 | 2 +-
> tests/qemu-iotests/244 | 2 +-
> tests/qemu-iotests/244.out | 10 +--
> tests/qemu-iotests/247 | 1 -
> tests/qemu-iotests/check | 13 ++-
> tests/qemu-iotests/group | 169 +++++++++++++++++++-----------------
> 137 files changed, 372 insertions(+), 421 deletions(-)
> delete mode 100755 tests/qemu-iotests-quick.sh
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread
* Re: [Qemu-devel] [PATCH v2 0/8] tests/qemu-iotests: Run basic iotests during "make check"
@ 2019-05-01 8:30 ` Alex Bennée
0 siblings, 0 replies; 62+ messages in thread
From: Alex Bennée @ 2019-05-01 8:30 UTC (permalink / raw)
To: Thomas Huth
Cc: Fam Zheng, Kevin Wolf, Ed Maste, qemu-block,
Philippe Mathieu-Daudé,
qemu-devel, Christophe Fergeau, Max Reitz,
Wainer dos Santos Moschetta, Li-Wen Hsu, Markus Armbruster
Thomas Huth <thuth@redhat.com> writes:
> People often forget to run the iotests before submitting patches or
> pull requests - this is likely due to the fact that we do not run the
> tests during our mandatory "make check" tests yet.
> This patch series now changes the "auto" group to only include tests
> that should be safe to run in all CI environments (including FreeBSD
> and macOS!). Thus these iotests can now always be run during "make
> check" automatically, too.
Assuming my local tests work I think I should queue these and submit a
PR right away. Sorry about the delay getting to them.
>
> v2:
> - Use "auto" group instead of adding a new "ci" group
> - Adjusted the tests that are run automatically (after doing lots
> of CI runs on cirrus-ci.com, gitlab and travis)
> - Added patch to fix the current regression with the "qemu-io:"
> prefix in the master branch
> - Added a fix for iotest 005 on ext4 filesystems (skip it there)
>
> Thomas Huth (8):
> tests/qemu-iotests: Fix output of qemu-io related tests
> tests/qemu-iotests/005: Add a sanity check for large sparse file
> support
> tests/qemu-iotests/check: Pick a default machine if necessary
> tests/qemu-iotests: Do not hard-code the path to bash
> cirrus / travis: Add gnu-sed and bash for macOS and FreeBSD
> tests/qemu-iotests: Remove the "_supported_os Linux" line from many
> tests
> tests/qemu-iotests/group: Re-use the "auto" group for tests that can
> always run
> tests: Run the iotests during "make check" again
>
> .cirrus.yml | 4 +-
> .travis.yml | 1 +
> tests/Makefile.include | 8 +-
> tests/check-block.sh | 44 +++++++---
> tests/qemu-iotests-quick.sh | 8 --
> tests/qemu-iotests/001 | 1 -
> tests/qemu-iotests/002 | 1 -
> tests/qemu-iotests/003 | 1 -
> tests/qemu-iotests/004 | 1 -
> tests/qemu-iotests/005 | 9 ++
> tests/qemu-iotests/007 | 1 -
> tests/qemu-iotests/008 | 1 -
> tests/qemu-iotests/009 | 1 -
> tests/qemu-iotests/010 | 1 -
> tests/qemu-iotests/011 | 1 -
> tests/qemu-iotests/012 | 1 -
> tests/qemu-iotests/015 | 1 -
> tests/qemu-iotests/017 | 1 -
> tests/qemu-iotests/020 | 1 -
> tests/qemu-iotests/021 | 1 -
> tests/qemu-iotests/022 | 1 -
> tests/qemu-iotests/025 | 1 -
> tests/qemu-iotests/026 | 1 -
> tests/qemu-iotests/026.out | 168 +++++++++++++++++------------------
> tests/qemu-iotests/027 | 1 -
> tests/qemu-iotests/029 | 1 -
> tests/qemu-iotests/031 | 1 -
> tests/qemu-iotests/032 | 1 -
> tests/qemu-iotests/033 | 1 -
> tests/qemu-iotests/035 | 1 -
> tests/qemu-iotests/036 | 1 -
> tests/qemu-iotests/037 | 1 -
> tests/qemu-iotests/042 | 1 -
> tests/qemu-iotests/043 | 1 -
> tests/qemu-iotests/046 | 1 -
> tests/qemu-iotests/047 | 1 -
> tests/qemu-iotests/049 | 1 -
> tests/qemu-iotests/050 | 1 -
> tests/qemu-iotests/051 | 1 -
> tests/qemu-iotests/052 | 1 -
> tests/qemu-iotests/053 | 1 -
> tests/qemu-iotests/054 | 1 -
> tests/qemu-iotests/060.out | 6 +-
> tests/qemu-iotests/062 | 1 -
> tests/qemu-iotests/063 | 1 -
> tests/qemu-iotests/066 | 1 -
> tests/qemu-iotests/067 | 1 -
> tests/qemu-iotests/068 | 1 -
> tests/qemu-iotests/069 | 1 -
> tests/qemu-iotests/069.out | 2 +-
> tests/qemu-iotests/070.out | 2 +-
> tests/qemu-iotests/071 | 1 -
> tests/qemu-iotests/072 | 1 -
> tests/qemu-iotests/073 | 1 -
> tests/qemu-iotests/075.out | 14 +--
> tests/qemu-iotests/076.out | 6 +-
> tests/qemu-iotests/078.out | 12 +--
> tests/qemu-iotests/079 | 1 -
> tests/qemu-iotests/080.out | 40 ++++-----
> tests/qemu-iotests/081.out | 2 +-
> tests/qemu-iotests/082 | 1 -
> tests/qemu-iotests/085 | 1 -
> tests/qemu-iotests/088.out | 12 +--
> tests/qemu-iotests/089 | 1 -
> tests/qemu-iotests/090 | 1 -
> tests/qemu-iotests/094 | 1 -
> tests/qemu-iotests/095 | 1 -
> tests/qemu-iotests/098 | 1 -
> tests/qemu-iotests/102 | 1 -
> tests/qemu-iotests/103 | 1 -
> tests/qemu-iotests/103.out | 14 +--
> tests/qemu-iotests/104 | 1 -
> tests/qemu-iotests/105 | 1 -
> tests/qemu-iotests/107 | 1 -
> tests/qemu-iotests/110 | 1 -
> tests/qemu-iotests/111 | 1 -
> tests/qemu-iotests/112 | 1 -
> tests/qemu-iotests/114 | 1 -
> tests/qemu-iotests/114.out | 2 +-
> tests/qemu-iotests/115 | 1 -
> tests/qemu-iotests/116.out | 14 +--
> tests/qemu-iotests/117 | 1 -
> tests/qemu-iotests/120 | 1 -
> tests/qemu-iotests/125 | 1 -
> tests/qemu-iotests/126 | 1 -
> tests/qemu-iotests/127 | 1 -
> tests/qemu-iotests/131.out | 2 +-
> tests/qemu-iotests/133 | 1 -
> tests/qemu-iotests/133.out | 30 +++----
> tests/qemu-iotests/134 | 1 -
> tests/qemu-iotests/137.out | 28 +++---
> tests/qemu-iotests/140.out | 2 +-
> tests/qemu-iotests/142 | 1 -
> tests/qemu-iotests/143 | 1 -
> tests/qemu-iotests/143.out | 2 +-
> tests/qemu-iotests/144 | 1 -
> tests/qemu-iotests/145 | 1 -
> tests/qemu-iotests/153 | 1 -
> tests/qemu-iotests/153.out | 30 +++----
> tests/qemu-iotests/156 | 1 -
> tests/qemu-iotests/157 | 1 -
> tests/qemu-iotests/158 | 1 -
> tests/qemu-iotests/159 | 1 -
> tests/qemu-iotests/162 | 1 -
> tests/qemu-iotests/170 | 1 -
> tests/qemu-iotests/173 | 1 -
> tests/qemu-iotests/182 | 1 -
> tests/qemu-iotests/183 | 1 -
> tests/qemu-iotests/186 | 1 -
> tests/qemu-iotests/187 | 1 -
> tests/qemu-iotests/187.out | 6 +-
> tests/qemu-iotests/188.out | 2 +-
> tests/qemu-iotests/190 | 1 -
> tests/qemu-iotests/191 | 1 -
> tests/qemu-iotests/192 | 1 -
> tests/qemu-iotests/195 | 1 -
> tests/qemu-iotests/197 | 1 -
> tests/qemu-iotests/197.out | 2 +-
> tests/qemu-iotests/200 | 1 -
> tests/qemu-iotests/205 | 2 +-
> tests/qemu-iotests/214 | 1 -
> tests/qemu-iotests/215 | 1 -
> tests/qemu-iotests/215.out | 2 +-
> tests/qemu-iotests/217 | 1 -
> tests/qemu-iotests/226.out | 16 ++--
> tests/qemu-iotests/227 | 1 -
> tests/qemu-iotests/231 | 1 -
> tests/qemu-iotests/233 | 1 -
> tests/qemu-iotests/239 | 2 +-
> tests/qemu-iotests/240 | 3 +-
> tests/qemu-iotests/241 | 2 +-
> tests/qemu-iotests/243 | 2 +-
> tests/qemu-iotests/244 | 2 +-
> tests/qemu-iotests/244.out | 10 +--
> tests/qemu-iotests/247 | 1 -
> tests/qemu-iotests/check | 13 ++-
> tests/qemu-iotests/group | 169 +++++++++++++++++++-----------------
> 137 files changed, 372 insertions(+), 421 deletions(-)
> delete mode 100755 tests/qemu-iotests-quick.sh
--
Alex Bennée
^ permalink raw reply [flat|nested] 62+ messages in thread