qemu-iotests: change _supported_proto to file for various tests

all these tests do anything of the following and thus fail with any
protocol other than file:
 - the tests use rm, cp or mv shell commands which only work on file
 - the tests use qcow2.py
 - the images construct new filenames (e.g. backing file names) and
   the logic is broken for anything else than file

Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/tests/qemu-iotests/013 b/tests/qemu-iotests/013
index 389f4b815686409ae15e8e17ef9177c8f16d5d42..ea3cab91d6272ffc09d25f816dbe8d664be6a43f 100755 (executable)
--- a/tests/qemu-iotests/013
+++ b/tests/qemu-iotests/013
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # much of this could be generic for any format supporting compression.
 _supported_fmt qcow qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"

diff --git a/tests/qemu-iotests/014 b/tests/qemu-iotests/014
index 0edeb4b6f57f7f350cd5bd3376edb1ca65a9b552..b23c2db9b6e3bd1bcc3e9a639cd699665c62137c 100755 (executable)
--- a/tests/qemu-iotests/014
+++ b/tests/qemu-iotests/014
@@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # much of this could be generic for any format supporting snapshots
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"

diff --git a/tests/qemu-iotests/018 b/tests/qemu-iotests/018
index 6f7f0545d0bf6ddfd74717a801098eedf36210c9..d8a7d435ab75586ad42ceb7722360a96af4609a2 100755 (executable)
--- a/tests/qemu-iotests/018
+++ b/tests/qemu-iotests/018
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 

diff --git a/tests/qemu-iotests/019 b/tests/qemu-iotests/019
index b43e70f3cb4797ce39c0c72c1bc034e7f6a0474c..e67445c75497218eaec11f007fa6111474b345e9 100755 (executable)
--- a/tests/qemu-iotests/019
+++ b/tests/qemu-iotests/019
@@ -45,7 +45,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \

diff --git a/tests/qemu-iotests/023 b/tests/qemu-iotests/023
index 090ed23dece1cb35be13221556bd527dc66525ff..9ad06b990e2ca7c4f12ba3d4251aee47b3a4706f 100755 (executable)
--- a/tests/qemu-iotests/023
+++ b/tests/qemu-iotests/023
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # much of this could be generic for any format supporting compression.
 _supported_fmt qcow qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 TEST_OFFSETS="0 4294967296"

diff --git a/tests/qemu-iotests/024 b/tests/qemu-iotests/024
index be974f02a288a3ccde88e9be546fcb41170c9564..9bf99e198a6df4b6785721aea58d4bbf97ef9f4b 100755 (executable)
--- a/tests/qemu-iotests/024
+++ b/tests/qemu-iotests/024
@@ -43,7 +43,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Currently only qcow2 and qed support rebasing
 _supported_fmt qcow2 qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 CLUSTER_SIZE=65536

diff --git a/tests/qemu-iotests/026 b/tests/qemu-iotests/026
index c9c5f839363e20ba9c76edceaabeb7f99a89a8db..df2884ba5148740dc043b54ef94e283f4ec717e1 100755 (executable)
--- a/tests/qemu-iotests/026
+++ b/tests/qemu-iotests/026
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Currently only qcow2 supports rebasing
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough" "none"

diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index 93a9fa6e8330cc27bad95811c9cf4a8225b9eb31..a99e4fa2bdf7048edb6a10589d5b38d1ca31809c 100755 (executable)
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -45,7 +45,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 generic
+_supported_proto file
 _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 c9070b0513b17d80648696c262da17ee3d233419..1d920ea87a340849bf994b7116d3c4eb6b0267ae 100755 (executable)
--- a/tests/qemu-iotests/031
+++ b/tests/qemu-iotests/031
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 CLUSTER_SIZE=65536

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

diff --git a/tests/qemu-iotests/036 b/tests/qemu-iotests/036
index e049a645e7983f2446bed9bda18c4ba01a261c3c..03b6aa9de70a353a089baa9b2040f5764c15fc9f 100755 (executable)
--- a/tests/qemu-iotests/036
+++ b/tests/qemu-iotests/036
@@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qcow2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 # Only qcow2v3 and later supports feature bits

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

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

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

diff --git a/tests/qemu-iotests/043 b/tests/qemu-iotests/043
index d7f12319b34c1553fd476905fa1638b32194132c..b316b97c0c87bc27a578ff3ef0c53e5025fd1de5 100755 (executable)
--- a/tests/qemu-iotests/043
+++ b/tests/qemu-iotests/043
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # Any format supporting backing files
 _supported_fmt qcow2 qed
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 

diff --git a/tests/qemu-iotests/046 b/tests/qemu-iotests/046
index 3f17ceb1b95664d6e732867bc6f96eb16b18b5d6..2d44bbb187970f2a568410b0458642b354a717ed 100755 (executable)
--- a/tests/qemu-iotests/046
+++ b/tests/qemu-iotests/046
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 CLUSTER_SIZE=64k

diff --git a/tests/qemu-iotests/052 b/tests/qemu-iotests/052
index 4d4e411339d97b45cd25ea5556afdef527ecca26..6bdae92780d93fdb92dba570c98fc9e6a815fab3 100755 (executable)
--- a/tests/qemu-iotests/052
+++ b/tests/qemu-iotests/052
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt generic
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough"

diff --git a/tests/qemu-iotests/054 b/tests/qemu-iotests/054
index 5a0d1b16c281e424cc9ad22b96893a8196ab7597..c8b7082b4e3be049af95c3421ebcbcba26d11f6f 100755 (executable)
--- a/tests/qemu-iotests/054
+++ b/tests/qemu-iotests/054
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 echo

diff --git a/tests/qemu-iotests/059 b/tests/qemu-iotests/059
index 2d604d3a9103634f5e4f8d12317ffe3162240c58..ca5aa16ff7a8633c9bf918ee6621c8b799dd763d 100755 (executable)
--- a/tests/qemu-iotests/059
+++ b/tests/qemu-iotests/059
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests vmdk-specific low-level functionality
 _supported_fmt vmdk
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \

diff --git a/tests/qemu-iotests/060 b/tests/qemu-iotests/060
index bbb19090a19d56addad017194a063ec745c0787b..af8ed9f39afff5e2dbad00bc21e7384fd728264f 100755 (executable)
--- a/tests/qemu-iotests/060
+++ b/tests/qemu-iotests/060
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 rt_offset=65536  # 0x10000 (XXX: just an assumption)

diff --git a/tests/qemu-iotests/061 b/tests/qemu-iotests/061
index e42f9bd5e862391b30bbb2ad7b264448b299ac07..d3a6b388b55efe24a4e04737c096a66a1108bfa7 100755 (executable)
--- a/tests/qemu-iotests/061
+++ b/tests/qemu-iotests/061
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests qocw2-specific low-level functionality
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 echo

diff --git a/tests/qemu-iotests/063 b/tests/qemu-iotests/063
index 77503a298425a92680572d36e96a62a0922d8cff..a47493a0766f3d403dc3316f83240c2d2b67eb6a 100755 (executable)
--- a/tests/qemu-iotests/063
+++ b/tests/qemu-iotests/063
@@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.pattern
 
 _supported_fmt qcow qcow2 vmdk qed raw
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \

diff --git a/tests/qemu-iotests/069 b/tests/qemu-iotests/069
index 50347d91d2e094c30fe4ec9ba4650b8c70d6e51d..e661598c4add502e0554475fe9dfb2a149abfd03 100755 (executable)
--- a/tests/qemu-iotests/069
+++ b/tests/qemu-iotests/069
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt cow qed qcow qcow2 vmdk
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 

diff --git a/tests/qemu-iotests/071 b/tests/qemu-iotests/071
index dbc07c6c4f53f906f688c005fba430c98d7895c8..3924e51f5144666ed95ca4d9a6eb4e5fdec1cc38 100755 (executable)
--- a/tests/qemu-iotests/071
+++ b/tests/qemu-iotests/071
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 function do_run_qemu()

diff --git a/tests/qemu-iotests/072 b/tests/qemu-iotests/072
index a3876c21610c30ef6776b977f3919df5ab70b75e..58faa8b5a725ac39cbb9f50a96a826ab499874ad 100755 (executable)
--- a/tests/qemu-iotests/072
+++ b/tests/qemu-iotests/072
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt vpc vmdk vhdx vdi qed qcow2 qcow cow
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 IMG_SIZE=64M