aboutsummaryrefslogtreecommitdiff
path: root/tests/qemu-iotests
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-03-26 13:05:23 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2014-04-01 13:59:46 +0200
commit47f73da0a7d36e399eaa353d93afce90de9b599d (patch)
treec187477e4f52c1e66fe0cab3cada0ad003610a71 /tests/qemu-iotests
parentc5a33ee9eee031c9bae362b9bd7045cd8ff24d86 (diff)
downloadqemu-47f73da0a7d36e399eaa353d93afce90de9b599d.zip
qemu-47f73da0a7d36e399eaa353d93afce90de9b599d.tar.gz
qemu-47f73da0a7d36e399eaa353d93afce90de9b599d.tar.bz2
qemu-iotests: add ./check -cloop support
Add the cloop block driver to qemu-iotests. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'tests/qemu-iotests')
-rw-r--r--tests/qemu-iotests/common7
-rw-r--r--tests/qemu-iotests/common.rc3
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index 5795358..37e3bed 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -137,6 +137,7 @@ common options
check options
-raw test raw (default)
-cow test cow
+ -cloop test cloop
-qcow test qcow
-qcow2 test qcow2
-qed test qed
@@ -178,6 +179,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 881079b..7f00883 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -364,6 +364,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