diff options
author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2010-10-31 16:10:20 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2010-10-31 16:10:20 -0400 |
commit | 6d417ab6298d56e0e6f9faa83e885acbbf8b4d01 (patch) | |
tree | 59048c1bdef1f2fbc0378deb28449cf52da12241 | |
parent | 4322531ca3d936939dddd07c442a3d64e0f68008 (diff) | |
download | qemu-iotests-6d417ab6298d56e0e6f9faa83e885acbbf8b4d01.tar.gz |
add support for qed format
Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
-rwxr-xr-x | 017 | 2 | ||||
-rwxr-xr-x | 018 | 2 | ||||
-rwxr-xr-x | 019 | 2 | ||||
-rwxr-xr-x | 020 | 2 | ||||
-rwxr-xr-x | 024 | 4 | ||||
-rwxr-xr-x | 027 | 2 | ||||
-rwxr-xr-x | 028 | 2 | ||||
-rw-r--r-- | common | 6 | ||||
-rw-r--r-- | common.rc | 3 |
9 files changed, 16 insertions, 9 deletions
@@ -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" @@ -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" @@ -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" @@ -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" @@ -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 @@ -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 @@ -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 @@ -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 @@ -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" } |