Merge branch 'qemu_img_commit' of git://github.com/Chenditang/tp-qemu into img_commit

Signed-off-by: NXu Tian <xutian@redhat.com>

qemu/tests/cfg/qemu_disk_img.cfg

@@ -75,20 +75,6 @@
                     image_format_sn1 = "qcow2"
                     convert_name_sn1 = "images/sn1_to_qcow2"
                     convert_format_sn1 = "qcow2"
-                    variants:
-                        - default:
-                        - cache_mode:
-                            variants:
-                                - none:
-                                    cache_mode = none
-                                - wirteback:
-                                    cache_mode = writeback
-                                - unsafe:
-                                    cache_mode = unsafe
-                                - directsync:
-                                    cache_mode = directsync
-                                - writethrough:
-                                    cache_mode = writethrough
         - commit:
             type = qemu_disk_img_commit
             guest_file_name = ${tmp_dir}/test.img
@@ -96,6 +82,20 @@
             image_chain += " sn1"
             image_name_sn1 = "images/sn1"
             image_format_sn1 = "qcow2"
+            variants:
+                - default:
+                - cache_mode:
+                    variants:
+                        - none:
+                            cache_mode = none
+                        - wirteback:
+                            cache_mode = writeback
+                        - unsafe:
+                            cache_mode = unsafe
+                        - directsync:
+                            cache_mode = directsync
+                        - writethrough:
+                            cache_mode = writethrough
         - info:
             type = qemu_disk_img_info
             guest_file_name_image1 = "${tmp_dir}/test.img"