From: Stefan Hajnoczi <stefa...@redhat.com>
Add the cloop block driver to qemu-iotests.
Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
Signed-off-by: Kevin Wolf <kw...@redhat.com>
Reviewed-by: Max Reitz <mre...@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
(cherry picked from commit 47f73da0a7d36e399eaa353d93afce90de9b599d)
Signed-off-by: Michael Roth <mdr...@linux.vnet.ibm.com>
---
tests/qemu-iotests/common | 7 +++++++
tests/qemu-iotests/common.rc | 3 +++
2 files changed, 10 insertions(+)
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index 8cde7f1..b5043fc 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -129,6 +129,7 @@ common options
check options
-raw test raw (default)
-cow test cow
+ -cloop test cloop
-qcow test qcow
-qcow2 test qcow2
-qed test qed
@@ -167,6 +168,12 @@ testlist options
xpand=false
;;
+ -cloop)
+ IMGFMT=cloop
+ IMGFMT_GENERIC=false
+ xpand=false
+ ;;
+
-qcow)
IMGFMT=qcow
xpand=false
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 7f62457..65c5bc1 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -350,6 +350,9 @@ _fail()
#
_supported_fmt()
{
+ # "generic" is suitable for most image formats. For some formats it doesn't
+ # work, however (most notably read-only formats), so they can opt out by
+ # setting IMGFMT_GENERIC to false.
for f; do
if [ "$f" = "$IMGFMT" -o "$f" = "generic" -a "$IMGFMT_GENERIC" =
"true" ]; then
return
--
1.9.1
