iotests: Enable fuse for many tests

Many tests (that do not support generic protocols) can run just fine
with FUSE-exported images, so allow them to.  Note that this is no
attempt at being definitely complete.  There are some tests that might
be modified to run on FUSE, but this patch still skips them.  This patch
only tries to pick the rather low-hanging fruits.

Note that 221 and 250 only pass when .lseek is correctly implemented,
which is only possible with a libfuse that is 3.8 or newer.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201027190600.192171-20-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/tests/qemu-iotests/025 b/tests/qemu-iotests/025
index e05d833452dc250e62d242219e0eb9c662db4127..1569d912f436429d063ddee2428b53d83e100736 100755 (executable)
--- a/tests/qemu-iotests/025
+++ b/tests/qemu-iotests/025
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern
 
 _supported_fmt raw qcow2 qed luks
-_supported_proto file sheepdog rbd nfs
+_supported_proto file sheepdog rbd nfs fuse
 
 echo "=== Creating image"
 echo

diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index b9713eb591378fff217fc9b5ddddd06578f4ff12..9ecc5880b13c0d9ef0f721738227642deda1fac3 100755 (executable)
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Currently only qcow2 supports rebasing
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _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/028 b/tests/qemu-iotests/028
index 864dc4a4e2e0d7ac09779daa8305bf5ae4a2896e..57d34aae99b74728585a12af7b1ad0a88c740120 100755 (executable)
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -46,7 +46,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files except vmdk and qcow which do not support
 # smaller backing files.
 _supported_fmt qcow2 qed
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 # Choose a size that is not necessarily a cluster size multiple for image

diff --git a/tests/qemu-iotests/031 b/tests/qemu-iotests/031
index 646ecd593f0c00d003a6b8836feab18b3138e50d..2bcbc5886e63fd2b7c4db37e8e0ce1238890039c 100755 (executable)
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # We want to test compat=0.10, which does not support external data
 # files or refcount widths other than 16
 _unsupported_imgopts data_file 'refcount_bits=\([^1]\|.\([^6]\|$\)\)'

diff --git a/tests/qemu-iotests/034 b/tests/qemu-iotests/034
index ac2d687c71da7e43a1ccc08b0caa8301fa286817..08f7aea6d5a6ecb033902af07086fe4ee4b0d5bf 100755 (executable)
--- a/tests/qemu-iotests/034
+++ b/tests/qemu-iotests/034
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \

diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index cf522de7a1aa71c58f52b9b77386754d5662713c..6b82638080361b6d242881762e6bdd4daa33ecaa 100755 (executable)
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # Only qcow2v3 and later supports feature bits;
 # qcow2.py does not support external data files;
 # this test requires a cluster size large enough for the feature table

diff --git a/tests/qemu-iotests/037 b/tests/qemu-iotests/037
index e1187ac24a0b41a73734e708768c036b612c9e4c..bb893c43dcc1422c46a1a368ee8666a80ae6fbcf 100755 (executable)
--- a/tests/qemu-iotests/037
+++ b/tests/qemu-iotests/037
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto file
+_supported_proto file fuse
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
                      "subformat=twoGbMaxExtentSparse" \

diff --git a/tests/qemu-iotests/038 b/tests/qemu-iotests/038
index a253231f5baf03a68123cfcf539ef289956c96bd..30f1f73c25130ff49d4f76d0b5b976a423343ba3 100755 (executable)
--- a/tests/qemu-iotests/038
+++ b/tests/qemu-iotests/038
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2 qed
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 CLUSTER_SIZE=2M

diff --git a/tests/qemu-iotests/039 b/tests/qemu-iotests/039
index 42f65031383afb7a9d63e369c12ef8fb147d8a78..ad3867c3fcfbdae76e87961c93b6c5e6721540e8 100755 (executable)
--- a/tests/qemu-iotests/039
+++ b/tests/qemu-iotests/039
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 _default_cache_mode writethrough
 _supported_cache_modes writethrough

diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 40a9f300870981fa17c88bb715a18e8acad49efc..ed6fae3529fd389bf4df5810c6bb8e9b9b3210ce 100755 (executable)
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # data_file does not support compressed clusters
 _unsupported_imgopts data_file
 

diff --git a/tests/qemu-iotests/050 b/tests/qemu-iotests/050
index 4b0a390c437c51139427a4f81cdaeb716e3d3447..741bdb610ee00540776fa20dd219231c6e9e12e4 100755 (executable)
--- a/tests/qemu-iotests/050
+++ b/tests/qemu-iotests/050
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2 qed
-_supported_proto file
+_supported_proto file fuse
 
 echo
 echo "== Creating images =="

diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
index a8905b60d0ed7c14f37e4937fbd6af13d54bbd63..40922db2b14f6f150a272519eaa1ba66c880e216 100755 (executable)
--- a/tests/qemu-iotests/054
+++ b/tests/qemu-iotests/054
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 echo
 echo "creating too large image (1 EB)"

diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index 94c0d5accc16ee29065c2fd08251563e142fdf37..4b81d1aa516e70b689b5555c6b08661cbc5b5d17 100755 (executable)
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -46,7 +46,7 @@ _filter_io_error()
 
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # These tests only work for compat=1.1 images without an external
 # data file with refcount_bits=16

diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index 18fe9054b07ea351dae96c7f51bc1f030be6ad24..49faae668401ff3d211a49f4e5276ed710cbb4af 100755 (executable)
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _require_drivers blkdebug blkverify
 # blkdebug can only inject errors on bs->file, not on the data_file,
 # so thie test does not work with external data files

diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 3642b51feb2123037e092cdbfc85cbbf4c8ae02f..0f0d94a2ac6a6e26ccb450f8bf68d9c0cb4b2c9c 100755 (executable)
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file nfs
+_supported_proto file nfs fuse
 
 # Some containers (e.g. non-x86 on Travis) do not allow large files
 _require_large_file 4G

diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index 7588c63b6c428ed7f4586bcf208930b925730879..bda8617c384351405c5b508669fcc1852f740d4a 100755 (executable)
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # - Internal snapshots are (currently) impossible with refcount_bits=1,
 #   and generally impossible with external data files

diff --git a/tests/qemu-iotests/089 b/tests/qemu-iotests/089
index 03a2ccf1e88fdea1f0fd7367e9f7867e438a490d..f0929b64c0c1dd192614a08b7cc1a6fa79e3a978 100755 (executable)
--- a/tests/qemu-iotests/089
+++ b/tests/qemu-iotests/089
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # 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 1246e4f91076df10d306219e7835ec4ba92d571d..87e872ebf492c602012dfc4c18ac0d09957f7d3d 100755 (executable)
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file nfs
+_supported_proto file nfs fuse
 # External data files do not support compressed clusters
 _unsupported_imgopts data_file
 

diff --git a/tests/qemu-iotests/091 b/tests/qemu-iotests/091
index 8a4ce5b7e27c6ba4cff074bc8e258c77e2afa7fd..8dee168bf697e978f2951161a8e95f2394434d2e 100755 (executable)
--- a/tests/qemu-iotests/091
+++ b/tests/qemu-iotests/091
@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 _supported_cache_modes writethrough none writeback
 _default_cache_mode none writeback

diff --git a/tests/qemu-iotests/095 b/tests/qemu-iotests/095
index 77a5f0f3f597bcf9f53e0cfbfe8151d618c048af..7604ae696698ef6f632d911d9ed333f1ab03adfa 100755 (executable)
--- a/tests/qemu-iotests/095
+++ b/tests/qemu-iotests/095
@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 size_smaller=5M
 size_larger=100M

diff --git a/tests/qemu-iotests/097 b/tests/qemu-iotests/097
index d910a8b107ea57d58b3f02f64da0eb6dbb75acca..1837d4e8e0ed0116b1c245a007e2408ca1694c23 100755 (executable)
--- a/tests/qemu-iotests/097
+++ b/tests/qemu-iotests/097
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Any format supporting backing files and bdrv_make_empty
 _supported_fmt qcow qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 

diff --git a/tests/qemu-iotests/098 b/tests/qemu-iotests/098
index f2ccdd790980747d8d9ee2e894cd0cd582ff1f44..a35ce7205edeabf2155864a2f2413ca36f799988 100755 (executable)
--- a/tests/qemu-iotests/098
+++ b/tests/qemu-iotests/098
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # The code path we want to test here only works for compat=1.1 images;
 # blkdebug can only inject errors on bs->file, so external data files
 # do not work with this test

diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index b898df436fcb7905e78e9178ef6eb2c9223e12a2..2cc3efd1edac90385315c4b9f6f06cbd3f8d78c6 100755 (executable)
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 IMG_SIZE=64K
 

diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index 8c1ebe0443979fcef28501af7b8905391f6887e8..220481db4c067abb5cff8d9a1b66a83c6ba6f5ac 100755 (executable)
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file nfs
+_supported_proto file nfs fuse
 # Internal snapshots are (currently) impossible with refcount_bits=1,
 # and generally impossible with external data files
 _unsupported_imgopts 'refcount_bits=1[^0-9]' data_file

diff --git a/tests/qemu-iotests/106 b/tests/qemu-iotests/106
index a20659d443803591615b3ff37b087afb9025fac5..20ad7bd5a226219a1d41d7b948dd23404a070ba6 100755 (executable)
--- a/tests/qemu-iotests/106
+++ b/tests/qemu-iotests/106
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt raw
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 # in kB

diff --git a/tests/qemu-iotests/107 b/tests/qemu-iotests/107
index 268ba27688951d86ca2893fd3ed6ee8621b454ed..d24829ccf9ee602865ea0818b5cb790ed2780df9 100755 (executable)
--- a/tests/qemu-iotests/107
+++ b/tests/qemu-iotests/107
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file nfs
+_supported_proto file nfs fuse
 
 
 IMG_SIZE=64K

diff --git a/tests/qemu-iotests/108 b/tests/qemu-iotests/108
index 5f7076fba4a17c24b623c58f8872982f5dc69a90..ba67748bdf33aee287c3fb04d9573b51cfe2c2d3 100755 (executable)
--- a/tests/qemu-iotests/108
+++ b/tests/qemu-iotests/108
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # This test directly modifies a refblock so it relies on refcount_bits being 16;
 # and the low-level modification it performs are not tuned for external data

diff --git a/tests/qemu-iotests/111 b/tests/qemu-iotests/111
index 3b43d1bd8369d6043a403be62ceb5cfd74697e07..bd839a39f4b272c4efd05010d09d9e7cabb2425b 100755 (executable)
--- a/tests/qemu-iotests/111
+++ b/tests/qemu-iotests/111
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qed qcow qcow2 vmdk
-_supported_proto file
+_supported_proto file fuse
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
 _make_test_img -b "$TEST_IMG.inexistent"

diff --git a/tests/qemu-iotests/112 b/tests/qemu-iotests/112
index 20ff5c224ae3c0a816d46f8ca900518656028d81..6e413f56510dc7840bd6e42749fd109bd3388e6d 100755 (executable)
--- a/tests/qemu-iotests/112
+++ b/tests/qemu-iotests/112
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # This test will set refcount_bits on its own which would conflict with the
 # manual setting; compat will be overridden as well;
 # and external data files do not work well with our refcount testing

diff --git a/tests/qemu-iotests/115 b/tests/qemu-iotests/115
index d254b183420189ae51008c5817e101a421fd45eb..7f53987d1b885be7a6330cd494b52ecc0d39d4c9 100755 (executable)
--- a/tests/qemu-iotests/115
+++ b/tests/qemu-iotests/115
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # 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 f37b34f8b1e609fa8a664d50c2755d0b6a6447d9..9039555ac4bd40ce273b7f32eaf12eb511febf7f 100755 (executable)
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 _make_test_img 64k
 

diff --git a/tests/qemu-iotests/120 b/tests/qemu-iotests/120
index 2931a7550f9f6ef1a27c54590325a6cf25382035..45c55c1c017dd2475554a912a64c31f69677a8d7 100755 (executable)
--- a/tests/qemu-iotests/120
+++ b/tests/qemu-iotests/120
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt generic
-_supported_proto file
+_supported_proto file fuse
 _unsupported_fmt luks
 _require_drivers raw
 

diff --git a/tests/qemu-iotests/121 b/tests/qemu-iotests/121
index 90ea0db73705271b3de7c81f42e19268c837a6d2..8357ce089a2d5e2b36d5e7442973286cbb4e9cfd 100755 (executable)
--- a/tests/qemu-iotests/121
+++ b/tests/qemu-iotests/121
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # Refcount structures are used much differently with external data
 # files

diff --git a/tests/qemu-iotests/127 b/tests/qemu-iotests/127
index e2ac2f55364dcd882b766dbf960e1cbffe5af177..77fdfd020521997aadb76d4f55f48a6de5e2c654 100755 (executable)
--- a/tests/qemu-iotests/127
+++ b/tests/qemu-iotests/127
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 _require_devices virtio-scsi scsi-hd
 

diff --git a/tests/qemu-iotests/133 b/tests/qemu-iotests/133
index 4070fd9457b2e183db4a0fda0d07cf4bc86a5a47..bc82d8ebd79c2805a901bf207b50bc906edc27a5 100755 (executable)
--- a/tests/qemu-iotests/133
+++ b/tests/qemu-iotests/133
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 TEST_IMG="$TEST_IMG.base" _make_test_img 64M
 _make_test_img -b "$TEST_IMG.base" -F $IMGFMT

diff --git a/tests/qemu-iotests/137 b/tests/qemu-iotests/137
index 7ae86892f7fc99d3e12bf7117598fcfa323110d6..de555a91c9f746dc7d7199b70c756ea44b300629 100755 (executable)
--- a/tests/qemu-iotests/137
+++ b/tests/qemu-iotests/137
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # We are going to use lazy-refcounts
 _unsupported_imgopts 'compat=0.10'

diff --git a/tests/qemu-iotests/138 b/tests/qemu-iotests/138
index 1d5b0bed6dcd37c2e4382562b4d902795f3ceb77..e87a64eb89e552fbf076694159f02e1bef783059 100755 (executable)
--- a/tests/qemu-iotests/138
+++ b/tests/qemu-iotests/138
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # With an external data file, data clusters are not refcounted
 # (so qemu-img check would not do much);

diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
index 309b177e77f5b0ecae727620d66d699016a5adec..ff6b904fa0e8b41ed42659729994848e65ac0acb 100755 (executable)
--- a/tests/qemu-iotests/140
+++ b/tests/qemu-iotests/140
@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt generic
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 _make_test_img 64k

diff --git a/tests/qemu-iotests/154 b/tests/qemu-iotests/154
index 7f1c0d9bd98109cb3fd0c28b6a6ca2b0b821cc6f..34a1c051b6e6da332f4e0411645ede47f25e1b7c 100755 (executable)
--- a/tests/qemu-iotests/154
+++ b/tests/qemu-iotests/154
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 CLUSTER_SIZE=4k

diff --git a/tests/qemu-iotests/161 b/tests/qemu-iotests/161
index bbf7dbbc5c6b8ce5ff7122f0f1f0e94f3a02d085..4fb7d0cbf0367c096e138a3b00a739180bd5e81e 100755 (executable)
--- a/tests/qemu-iotests/161
+++ b/tests/qemu-iotests/161
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Any format implementing BlockDriver.bdrv_change_backing_file
 _supported_fmt qcow2 qed
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 IMG_SIZE=1M

diff --git a/tests/qemu-iotests/171 b/tests/qemu-iotests/171
index 341064a1c6bddac786488a86f3f96f8711f7a6e6..f3582edb1032b9bca97b6f8848e5eba347b7c224 100755 (executable)
--- a/tests/qemu-iotests/171
+++ b/tests/qemu-iotests/171
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt raw
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 

diff --git a/tests/qemu-iotests/175 b/tests/qemu-iotests/175
index c3c2aed653fef9ab6bddac8357db18c8d4c1fa1f..21a77a2bf55abeb55d7ecb7c05202771e88eba70 100755 (executable)
--- a/tests/qemu-iotests/175
+++ b/tests/qemu-iotests/175
@@ -71,7 +71,7 @@ EOF
 . ./common.filter
 
 _supported_fmt raw
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 _default_cache_mode none

diff --git a/tests/qemu-iotests/176 b/tests/qemu-iotests/176
index 2565ff12eef8f281b52a4e0b53760b1c6ea87e92..5ce3b270697179a2ae712113ce3349d88c14abfb 100755 (executable)
--- a/tests/qemu-iotests/176
+++ b/tests/qemu-iotests/176
@@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This test is specific to qcow2
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # Persistent dirty bitmaps require compat=1.1;
 # Internal snapshots forbid using an external data file

diff --git a/tests/qemu-iotests/177 b/tests/qemu-iotests/177
index 5d4a77a6ab4732bc7770249af5c19fde611aeaeb..595bfd4236d72c9bcd56825a87c8493396eec00f 100755 (executable)
--- a/tests/qemu-iotests/177
+++ b/tests/qemu-iotests/177
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # tests specific to compat=1.1.
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 CLUSTER_SIZE=1M
 size=128M

diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179
index 11a20cb1bfa87928d07bf9808c2da2c9fc3c442c..7ada04c6410976f29237e4bddf91d2a68081d41a 100755 (executable)
--- a/tests/qemu-iotests/179
+++ b/tests/qemu-iotests/179
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 # v2 images can't mark clusters as zero

diff --git a/tests/qemu-iotests/183 b/tests/qemu-iotests/183
index acdbefa3101ebeb49a95a406f6e18605254c798d..d889a3b19cce5b069a26205bb64cd25da3ad08be 100755 (executable)
--- a/tests/qemu-iotests/183
+++ b/tests/qemu-iotests/183
@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_os Linux FreeBSD NetBSD
 _supported_fmt qcow2 raw qed quorum
-_supported_proto file
+_supported_proto file fuse
 
 size=64M
 _make_test_img $size

diff --git a/tests/qemu-iotests/186 b/tests/qemu-iotests/186
index 3ea0442d44fcaa7d079f080baf2730281ac96d99..0db25b0e682027fafc9d23e1f2f2b8a1904fd444 100755 (executable)
--- a/tests/qemu-iotests/186
+++ b/tests/qemu-iotests/186
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _require_drivers null-co
 
 if [ "$QEMU_DEFAULT_MACHINE" != "pc" ]; then

diff --git a/tests/qemu-iotests/187 b/tests/qemu-iotests/187
index c6e1dc57a01746cea1295c0ade032c4ca24f9b23..f262d83e3aea59e909c4258c2b45cc6ccf6ea1f4 100755 (executable)
--- a/tests/qemu-iotests/187
+++ b/tests/qemu-iotests/187
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 size=64M
 _make_test_img $size

diff --git a/tests/qemu-iotests/191 b/tests/qemu-iotests/191
index d17462e1e42baac0a59603918ec87506b58eda03..95a891350dcfe0b742fd6508440b63ddb2d35cf1 100755 (executable)
--- a/tests/qemu-iotests/191
+++ b/tests/qemu-iotests/191
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # An external data file would change the query-named-block-nodes output
 _unsupported_imgopts data_file
 

diff --git a/tests/qemu-iotests/195 b/tests/qemu-iotests/195
index 2351d55fe1f1ed174ed6b0572e54e959492613a3..967af5b7b5fb56da5ab2c30ff41b19cb114edc37 100755 (executable)
--- a/tests/qemu-iotests/195
+++ b/tests/qemu-iotests/195
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 do_run_qemu()
 {

diff --git a/tests/qemu-iotests/200 b/tests/qemu-iotests/200
index a7aabbd032c0e60f09ee98de6ca9d302f29195dd..046539154f55fce0fd01146484396cd0993dc780 100755 (executable)
--- a/tests/qemu-iotests/200
+++ b/tests/qemu-iotests/200
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2 qed
-_supported_proto file
+_supported_proto file fuse
 
 BACKING_IMG="$TEST_IMG.base"
 

diff --git a/tests/qemu-iotests/204 b/tests/qemu-iotests/204
index 6770fa9b96369f38111aa595c8200b3486e145bd..536bb8b534eaa4f563c922357163ec03478d0e88 100755 (executable)
--- a/tests/qemu-iotests/204
+++ b/tests/qemu-iotests/204
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # This test assumes that discard leaves zero clusters; see test 177 for
 # other tests that also work in older images
 _unsupported_imgopts 'compat=0.10'

diff --git a/tests/qemu-iotests/214 b/tests/qemu-iotests/214
index af677d90b86e189c9a379ce7949788588b52ef5a..75ae7a14b534de75ada19b2006ea6059b271f4bc 100755 (executable)
--- a/tests/qemu-iotests/214
+++ b/tests/qemu-iotests/214
@@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 # 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/217 b/tests/qemu-iotests/217
index d89116ccadd147c0bc845108a5f06ffd7d55c82b..73853424985aa30cef5a8cb130bcec6572067cf4 100755 (executable)
--- a/tests/qemu-iotests/217
+++ b/tests/qemu-iotests/217
@@ -36,7 +36,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This test is specific to qcow2
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 # 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/220 b/tests/qemu-iotests/220
index a9259b7127fcec8cf282596c3272449aa18f64ce..9ba3b3fdcb6b74e8e9c6f2f0a796861071ccb3a4 100755 (executable)
--- a/tests/qemu-iotests/220
+++ b/tests/qemu-iotests/220
@@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # To use a different refcount width but 16 bits we need compat=1.1,
 # and external data files do not support compressed clusters.

diff --git a/tests/qemu-iotests/221 b/tests/qemu-iotests/221
index 0e9096fec75155dd3e81f96f65b678fe3c2d5360..ca62b3baa178df7eb4dce479de0a6803a1a7669c 100755 (executable)
--- a/tests/qemu-iotests/221
+++ b/tests/qemu-iotests/221
@@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt raw
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 _default_cache_mode writeback

diff --git a/tests/qemu-iotests/229 b/tests/qemu-iotests/229
index 5f759fa587149e6b4eb56e17428887d827083854..273ac2472d71f84f05a46bf076622fe0fd6626e1 100755 (executable)
--- a/tests/qemu-iotests/229
+++ b/tests/qemu-iotests/229
@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Needs backing file and backing format support
 _supported_fmt qcow2 qed
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # blkdebug can only inject errors on bs->file, so external data files
 # do not work with this test

diff --git a/tests/qemu-iotests/247 b/tests/qemu-iotests/247
index 87e37b39e2d8ea72de39bc5fea197cf7d0e8d126..6cf267975095942683b984bbc8fdbfe455bdaea8 100755 (executable)
--- a/tests/qemu-iotests/247
+++ b/tests/qemu-iotests/247
@@ -41,7 +41,7 @@ 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_proto file fuse
 
 size=128M
 

diff --git a/tests/qemu-iotests/249 b/tests/qemu-iotests/249
index a9aa9303eb1edb4e6ce100cb05f5739fce75a8b9..29453b8c9082f31a3fe0d56ba3a39752f7106bf9 100755 (executable)
--- a/tests/qemu-iotests/249
+++ b/tests/qemu-iotests/249
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Any format implementing BlockDriver.bdrv_change_backing_file
 _supported_fmt qcow2 qed
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 IMG_SIZE=1M

diff --git a/tests/qemu-iotests/250 b/tests/qemu-iotests/250
index 9bb6b94d74ff390952c7d70c791b7934ee562dbc..3df275c76b8375ebc8a1e5b2294016081298e035 100755 (executable)
--- a/tests/qemu-iotests/250
+++ b/tests/qemu-iotests/250
@@ -37,7 +37,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # This test does not make much sense with external data files
 _unsupported_imgopts data_file

diff --git a/tests/qemu-iotests/252 b/tests/qemu-iotests/252
index 6662f4c9dec76a3be23c6e9545f9930b55eb8a17..1d74afff992e9b48baf64278246355d90f06ef9d 100755 (executable)
--- a/tests/qemu-iotests/252
+++ b/tests/qemu-iotests/252
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # zero cluster support
 _supported_fmt qcow2
 _unsupported_imgopts 'compat=0.10'
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 CLUSTER_SIZE=65536

diff --git a/tests/qemu-iotests/265 b/tests/qemu-iotests/265
index 00f2ec769e9eda182aa9aad39e01f1c65ef23049..0e800fb524859e8b2f1ec479470172970508106b 100755 (executable)
--- a/tests/qemu-iotests/265
+++ b/tests/qemu-iotests/265
@@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # qcow2-specific test
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 
 echo '--- Writing to the image ---'

diff --git a/tests/qemu-iotests/268 b/tests/qemu-iotests/268
index 78c3f4db3a14f1d3eb2facd57493ad4ff987b16e..ddf4312284d11c9b6b14e22ff160cb1ec568e00b 100755 (executable)
--- a/tests/qemu-iotests/268
+++ b/tests/qemu-iotests/268
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 echo
 echo "== Required alignment larger than cluster size =="

diff --git a/tests/qemu-iotests/272 b/tests/qemu-iotests/272
index c2f782d47b6ee0194a43de86478b118bf137bcd9..de475bf6f06517c3557d615fd1492fbd35c1e1a5 100755 (executable)
--- a/tests/qemu-iotests/272
+++ b/tests/qemu-iotests/272
@@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This is a qcow2 regression test
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 
 # External data files do not support compression;
 # We need an exact cluster size (2M) and refcount width (2) so we can

diff --git a/tests/qemu-iotests/273 b/tests/qemu-iotests/273
index 41ffbf39c4efc01fe8db75f5dc2117f9d3c41092..79b4ab4b05c0d93e3815cb4a1edae7201995095f 100755 (executable)
--- a/tests/qemu-iotests/273
+++ b/tests/qemu-iotests/273
@@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This is a qcow2 regression test
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # External data files would add nodes to the block graph, so it would
 # not match the reference output

diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279
index 5515d4ed0138dc4b3bba5070eb661a1a0ffc92be..2a6315cf17aa1379c8312a600a7eab8b3309de5f 100755 (executable)
--- a/tests/qemu-iotests/279
+++ b/tests/qemu-iotests/279
@@ -36,7 +36,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Backing files are required...
 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \

diff --git a/tests/qemu-iotests/286 b/tests/qemu-iotests/286
index f14445ba4a5b40f974d1fc4d944f40090ab0b47c..f64e0eccea30f17a55fbb7e2783ec8badd8c8404 100755 (executable)
--- a/tests/qemu-iotests/286
+++ b/tests/qemu-iotests/286
@@ -35,7 +35,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.qemu
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # Internal snapshots are (currently) impossible with refcount_bits=1,
 # and generally impossible with external data files
 _unsupported_imgopts 'refcount_bits=1[^0-9]' data_file

diff --git a/tests/qemu-iotests/287 b/tests/qemu-iotests/287
index 036cc09e82b72404ddae4023e52be15e9a5c164d..3bb383fd4be0ad0abc7243ee040c35ec435ca30b 100755 (executable)
--- a/tests/qemu-iotests/287
+++ b/tests/qemu-iotests/287
@@ -32,7 +32,7 @@ status=1      # failure is the default!
 
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 _unsupported_imgopts 'compat=0.10' data_file
 

diff --git a/tests/qemu-iotests/289 b/tests/qemu-iotests/289
index 1c11d4030eface7f18ceb813c9b0697fb005ec89..fe69bde1ebfea91df4f447882cc3774dbbdf145b 100755 (executable)
--- a/tests/qemu-iotests/289
+++ b/tests/qemu-iotests/289
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 # This is a v3-exclusive test;
 # As for data_file, error paths often very much depend on whether
 # there is an external data file or not; so we create one exactly when

diff --git a/tests/qemu-iotests/290 b/tests/qemu-iotests/290
index 01ee14dcfb73921a960adf50832ab1070de57469..35c38d4f8091a4ec7db4cec99645727caf1d0830 100755 (executable)
--- a/tests/qemu-iotests/290
+++ b/tests/qemu-iotests/290
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 _unsupported_imgopts 'compat=0.10' refcount_bits data_file
 

diff --git a/tests/qemu-iotests/291 b/tests/qemu-iotests/291
index ecef9eec6240869fed27c9257e4fb6f4b87c01fb..bc70d5e38960441e7f6adbe8b53e6638a31a0577 100755 (executable)
--- a/tests/qemu-iotests/291
+++ b/tests/qemu-iotests/291
@@ -36,7 +36,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.nbd
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 _require_command QEMU_NBD
 # compat=0.10 does not support bitmaps

diff --git a/tests/qemu-iotests/292 b/tests/qemu-iotests/292
index 83ab19231da2ca0c20a123afebae352eefc96c50..3ae2772e3bbac50e059ac70cf34311bec93b19f7 100755 (executable)
--- a/tests/qemu-iotests/292
+++ b/tests/qemu-iotests/292
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 # We need qemu-img map to show the file where the data is allocated,
 # but with an external data file, it will show that instead of the

diff --git a/tests/qemu-iotests/293 b/tests/qemu-iotests/293
index f86fe3b41375f99e433079f690e984fc342400e4..3363bf07f072620338956a1247bbb88ca3caaa9d 100755 (executable)
--- a/tests/qemu-iotests/293
+++ b/tests/qemu-iotests/293
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2 luks
-_supported_proto file #TODO
+_supported_proto file fuse #TODO
 _require_working_luks
 
 QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT

diff --git a/tests/qemu-iotests/294 b/tests/qemu-iotests/294
index 9c95ed8c9a689c291b7a2f036bd94ebca4c1b0ed..87da35db496afa57d88ed4d9dfd055ae3d65a76e 100755 (executable)
--- a/tests/qemu-iotests/294
+++ b/tests/qemu-iotests/294
@@ -34,7 +34,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt luks
-_supported_proto file #TODO
+_supported_proto file fuse #TODO
 
 QEMU_IO_OPTIONS=$QEMU_IO_OPTIONS_NO_FMT
 

diff --git a/tests/qemu-iotests/305 b/tests/qemu-iotests/305
index 768818af4a99a021108c65812641b54dd44ce540..5a415eb2a47587e016e250cdfd8cf3a047b97886 100755 (executable)
--- a/tests/qemu-iotests/305
+++ b/tests/qemu-iotests/305
@@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file fuse
 _supported_os Linux
 _unsupported_imgopts cluster_size refcount_bits extended_l2 compat=0.10 data_file