qemu-iotests: add support for qed format

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Stefan Hajnoczi 2010-10-31 16:10:20 -04:00 committed by Kevin Wolf
parent 2684871af5
commit f5a4bbd913
9 changed files with 16 additions and 9 deletions

View file

@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.pattern
# Any format supporting backing files
_supported_fmt qcow qcow2 vmdk
_supported_fmt qcow qcow2 vmdk qed
_supported_os Linux
TEST_OFFSETS="0 4294967296"

View file

@ -40,7 +40,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.pattern
# Any format supporting backing files
_supported_fmt qcow qcow2 vmdk
_supported_fmt qcow qcow2 vmdk qed
_supported_os Linux
TEST_OFFSETS="0 4294967296"

View file

@ -44,7 +44,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.pattern
# Any format supporting backing files
_supported_fmt qcow qcow2 vmdk
_supported_fmt qcow qcow2 vmdk qed
_supported_os Linux
TEST_OFFSETS="0 4294967296"

View file

@ -42,7 +42,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.pattern
# Any format supporting backing files
_supported_fmt qcow qcow2 vmdk
_supported_fmt qcow qcow2 vmdk qed
_supported_os Linux
TEST_OFFSETS="0 4294967296"

View file

@ -41,8 +41,8 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.filter
. ./common.pattern
# Currently only qcow2 supports rebasing
_supported_fmt qcow2
# Currently only qcow2 and qed support rebasing
_supported_fmt qcow2 qed
_supported_os Linux
CLUSTER_SIZE=65536

View file

@ -38,7 +38,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
. ./common.rc
. ./common.filter
_supported_fmt vmdk qcow qcow2
_supported_fmt vmdk qcow qcow2 qed
_supported_os Linux

View file

@ -44,7 +44,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
_supported_fmt qcow2 qed
_supported_os Linux
# Choose a size that is not necessarily a cluster size multiple for image

View file

@ -119,6 +119,7 @@ check options
-cow test cow
-qcow test qcow
-qcow2 test qcow2
-qed test qed
-vdi test vdi
-vpc test vpc
-vmdk test vmdk
@ -158,6 +159,11 @@ testlist options
xpand=false
;;
-qed)
IMGFMT=qed
xpand=false
;;
-vdi)
IMGFMT=vdi
xpand=false

View file

@ -55,7 +55,7 @@ _make_test_img()
# at least one argument (the image size) needs to be added
local extra_img_options=$*
if [ "$IMGFMT" = "qcow2" -a -n "$CLUSTER_SIZE" ]; then
if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" ]; then
extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options"
fi
@ -65,6 +65,7 @@ _make_test_img()
sed -e "s#$IMGFMT#IMGFMT#g" | \
sed -e "s# encryption=off##g" | \
sed -e "s# cluster_size=0##g" | \
sed -e "s# table_size=0##g" | \
sed -e "s# compat6=off##g" | \
sed -e "s# static=off##g"
}