Thomas Huth <th...@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 <th...@redhat.com>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
Tested-by: Alex Bennée <alex.ben...@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
