block: qemu-iotests change _supported_proto to file once more.

In preparation to possible automatic regression and performance
testing for the block layer I found that the iotests don't work
for all protocols anymore.

In commit 1f7bf7d0 I started to change supported protocols from
generic to file for various tests. Unfortunately, some tests
added in the meantime again carry generic protocol altough they
can only work with file because they require local file access.

The other way around for some tests that only support file I added
NFS protocol after confirming they work.

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/tests/qemu-iotests/075 b/tests/qemu-iotests/075
index 40032c563d565c9deb4747d6338580030bfdef33..6117660c58b1e8946f02322fd3671b49d9a5b1db 100755 (executable)
--- a/tests/qemu-iotests/075
+++ b/tests/qemu-iotests/075
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt cloop
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 block_size_offset=128

diff --git a/tests/qemu-iotests/076 b/tests/qemu-iotests/076
index b614a7dd6e07031f181fe91838b06e6a0c3facf5..bc47457a855fdda2ab93485da2825a320ccea93b 100755 (executable)
--- a/tests/qemu-iotests/076
+++ b/tests/qemu-iotests/076
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt parallels
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 tracks_offset=$((0x1c))

diff --git a/tests/qemu-iotests/078 b/tests/qemu-iotests/078
index d4d6da7b090b55f42fa41331b47aaeecb82866b0..7be2c3f691692b6c19e356a57617f432ce089d96 100755 (executable)
--- a/tests/qemu-iotests/078
+++ b/tests/qemu-iotests/078
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt bochs
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 catalog_size_offset=$((0x48))

diff --git a/tests/qemu-iotests/079 b/tests/qemu-iotests/079
index 2142bbb377038afc2c7e4aa43e4f5e8370fe312f..6613cfb184266fc2763110e80fecd55bc54d254c 100755 (executable)
--- a/tests/qemu-iotests/079
+++ b/tests/qemu-iotests/079
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file nfs
 _supported_os Linux
 
 function test_qemu_img()

diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080
index 6b3a3e77a5f576d0725f0058eb0980520a5c150c..9de337c40766a855f299f18b80f88c238a4534ae 100755 (executable)
--- a/tests/qemu-iotests/080
+++ b/tests/qemu-iotests/080
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 header_size=104

diff --git a/tests/qemu-iotests/081 b/tests/qemu-iotests/081
index 7ae4be2053a76e8479c898d8a7ec870d91a99eae..ed3c29e13ca94bb6086e39940717225937aa9b9b 100755 (executable)
--- a/tests/qemu-iotests/081
+++ b/tests/qemu-iotests/081
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt raw
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 function do_run_qemu()

diff --git a/tests/qemu-iotests/082 b/tests/qemu-iotests/082
index 910b13e8f022396150603e184262bd823786b1ee..e64de277334c9b312e2bfce18a7797bb1a241dd5 100755 (executable)
--- a/tests/qemu-iotests/082
+++ b/tests/qemu-iotests/082
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file nfs
 _supported_os Linux
 
 function run_qemu_img()

diff --git a/tests/qemu-iotests/084 b/tests/qemu-iotests/084
index ae33c2cba47441df6921fc3624c7362a8451084e..2712c023a9b70c30b59299a280034a88073f7de6 100755 (executable)
--- a/tests/qemu-iotests/084
+++ b/tests/qemu-iotests/084
@@ -41,7 +41,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # This tests vdi-specific header fields
 _supported_fmt vdi
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 size=64M

diff --git a/tests/qemu-iotests/086 b/tests/qemu-iotests/086
index d9a80cf8638b470e9dcaf42bb21fbd0a6311be33..234eb9a91c2985b902e903f16f2e230fac6309c9 100755 (executable)
--- a/tests/qemu-iotests/086
+++ b/tests/qemu-iotests/086
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file nfs
 _supported_os Linux
 
 function run_qemu_img()

diff --git a/tests/qemu-iotests/088 b/tests/qemu-iotests/088
index c09adf80236aef796c87361303cec6d69766a4a4..f9c312918270aa64188154a1acb27ca404287885 100755 (executable)
--- a/tests/qemu-iotests/088
+++ b/tests/qemu-iotests/088
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt vpc
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 offset_block_size=$((512 + 32))

diff --git a/tests/qemu-iotests/090 b/tests/qemu-iotests/090
index 8d032f811142b452228bfae4b978abb2b08f5b9f..70b5a6fd7305ad597aae21f0445abd281efc65b5 100755 (executable)
--- a/tests/qemu-iotests/090
+++ b/tests/qemu-iotests/090
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file nfs
 _supported_os Linux
 
 IMG_SIZE=128K

diff --git a/tests/qemu-iotests/092 b/tests/qemu-iotests/092
index a8c0c9ca2b9d5c88d26f4be27f4e3ee304c77fdb..52c529bae3a8cf2d104872ba75eb28811fd4445d 100755 (executable)
--- a/tests/qemu-iotests/092
+++ b/tests/qemu-iotests/092
@@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow
-_supported_proto generic
+_supported_proto file
 _supported_os Linux
 
 offset_backing_file_offset=8

diff --git a/tests/qemu-iotests/103 b/tests/qemu-iotests/103
index 0f1dc9fa7d18224cc25cdb57223340802126a02c..ccab551f636467d131a75efff7187cc0d5db89b9 100755 (executable)
--- a/tests/qemu-iotests/103
+++ b/tests/qemu-iotests/103
@@ -39,7 +39,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 . ./common.filter
 
 _supported_fmt qcow2
-_supported_proto file
+_supported_proto file nfs
 _supported_os Linux
 
 IMG_SIZE=64K