[Qemu-devel] [RFC PATCH 16/16] qemu-iotests: use qcow3

[Kevin Wolf]

Not supposed to be committed like this.

Signed-off-by: Kevin Wolf <address@hidden>
---
 tests/qemu-iotests/common.rc |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 26811ca..0e66fcc 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -53,18 +53,36 @@ else
     TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
 fi
 
+_optstr_add()
+{
+    if [ -n "$1" ]; then
+        echo "$1,$2"
+    else
+        echo "$2"
+    fi
+}
+
 _make_test_img()
 {
     # extra qemu-img options can be added by tests
     # at least one argument (the image size) needs to be added
     local extra_img_options=$*
     local cluster_size_filter="s# cluster_size=[0-9]\\+##g"
+    local optstr=""
+
+    if [ "$IMGFMT" = "qcow2" ]; then
+        optstr=$(_optstr_add "$optstr" "compat=1.1")
+    fi
 
     if [ \( "$IMGFMT" = "qcow2" -o "$IMGFMT" = "qed" \) -a -n "$CLUSTER_SIZE" 
]; then
-        extra_img_options="-o cluster_size=$CLUSTER_SIZE $extra_img_options"
+        optstr=$(_optstr_add "$optstr" "cluster_size=$CLUSTER_SIZE")
         cluster_size_filter=""
     fi
 
+    if [ -n "$optstr" ]; then
+        extra_img_options="-o $optstr $extra_img_options"
+    fi
+
     # XXX(hch): have global image options?
     $QEMU_IMG create -f $IMGFMT $TEST_IMG $extra_img_options | \
        sed -e "s#$IMGPROTO:$TEST_DIR#TEST_DIR#g" | \
@@ -73,6 +91,7 @@ _make_test_img()
        sed -e "s# encryption=off##g" | \
        sed -e "$cluster_size_filter" | \
        sed -e "s# table_size=0##g" | \
+       sed -e "s# compat='[^']*'##g" | \
        sed -e "s# compat6=off##g" | \
        sed -e "s# static=off##g"
 }
-- 
1.7.6.5