diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-03-26 13:05:23 +0100 |
---|---|---|
committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-04-01 13:59:46 +0200 |
commit | 47f73da0a7d36e399eaa353d93afce90de9b599d (patch) | |
tree | c187477e4f52c1e66fe0cab3cada0ad003610a71 | |
parent | c5a33ee9eee031c9bae362b9bd7045cd8ff24d86 (diff) |
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>
-rw-r--r-- | tests/qemu-iotests/common | 7 | ||||
-rw-r--r-- | tests/qemu-iotests/common.rc | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common index 5795358924..37e3bed40c 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 881079bdb9..7f00883cad 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 |