Merge pull request #1159 from vivianQizhu/add-data-plane

Add data-plane as a matrix for all block jobs

qemu/tests/cfg/block_commit.cfg

@@ -18,6 +18,18 @@
     base_image = "images/sn1"
     top_image = "images/sn3"
     expected_image_file = "images/sn1"
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - with_payload:
             type = block_commit_stress

qemu/tests/cfg/block_stream.cfg

@@ -21,6 +21,18 @@
     kill_vm = yes
     alive_check_cmd = dir
     tmp_dir = /tmp
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - simple_test:
             type = block_stream_simple
@@ -89,15 +101,6 @@
             after_finished = "unload_stress reboot verify_alive"
             variants:
                 - @default:
-                - data_plane:
-                    only Host_RHEL.m7
-                    only virtio_blk virtio_scsi
-                    iothreads = iothread0
-                    virtio_blk:
-                        blk_extra_params_image1 = "iothread=${iothreads}"
-                    virtio_scsi:
-                        no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
-                        bus_extra_params_image1 = "iothread=${iothreads}"
                 - cancel_async:
                     wait_finished = no
                     cancel_timeout_image1 = 3

qemu/tests/cfg/block_stream_negative.cfg

@@ -16,6 +16,18 @@
     kill_vm = yes
     alive_check_cmd = dir
     tmp_dir = /tmp
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - simple_test:
             type = block_stream_negative

qemu/tests/cfg/drive_mirror.cfg

@@ -34,6 +34,18 @@
     repeat_times = 3
     cancel_timeout = 5
     #For drive_mirror_complete, target image will not be boot by default, as boot_target_image=no
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - 2qcow2:
             image_format_target = "qcow2"

qemu/tests/cfg/drive_mirror_negative_tests.cfg

@@ -32,6 +32,18 @@
     repeat_times = 3
     cancel_timeout = 5
     negative_test = yes
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - 2qcow2:
             image_format_target = "qcow2"

qemu/tests/cfg/live_backup.cfg

@@ -18,6 +18,18 @@
     before_incremental = "stop"
     after_incremental = "verify_job_info reopen"
     check_params = ""
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - @default:
             before_full_backup = "create_files reboot stop"
@@ -43,12 +55,3 @@
                     granularity = 32768
                 - 131072:
                     granularity = 131072
-        - with_data_plane:
-            only Host_RHEL.m7
-            only virtio_blk virtio_scsi
-            iothreads = iothread0
-            virtio_blk:
-                blk_extra_params_image1 = "iothread=iothread0"
-            virtio_scsi:
-                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
-                bus_extra_params_image1 = "iothread=iothread0"

qemu/tests/cfg/live_snapshot.cfg

@@ -13,6 +13,18 @@
     create_cmd = "dd if=/dev/urandom of=%s bs=1M count=1024"
     file_create = /var/tmp/file
     clean_cmd = rm -f
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - simple_test:
             type = live_snapshot_simple
@@ -127,3 +139,10 @@
             force_create_image = yes
             force_create_image_image1 = no
             after_finished = "reboot verify_alive"
+            with_data_plane:
+                virtio_blk:
+                    blk_extra_params_sn1 = "iothread=iothread0"
+                    blk_extra_params_sn2 = "iothread=iothread1"
+                virtio_scsi:
+                    bus_extra_params_sn1 = "iothread=iothread0"
+                    bus_extra_params_sn2 = "iothread=iothread1"

qemu/tests/cfg/live_snapshot_chain.cfg

@@ -14,6 +14,18 @@
     check_alive_cmd = "ls"
     kill_vm = yes
     remove_snapshot_images = yes
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - pause:
             file_create =

qemu/tests/cfg/live_snapshot_negative.cfg

@@ -11,6 +11,18 @@
     create_cmd = "dd if=/dev/urandom of=%s bs=1M count=1024"
     file_create = /var/tmp/file
     clean_cmd = rm -f
+    variants:
+        - @default:
+        - with_data_plane:
+            only Host_RHEL.m7
+            only virtio_blk virtio_scsi
+            #Add a redundant iothread for testing purpose
+            iothreads = "iothread0 iothread1"
+            virtio_blk:
+                blk_extra_params_image1 = "iothread=iothread0"
+            virtio_scsi:
+                no Host_RHEL.m7.u0, Host_RHEL.m7.u1, Host_RHEL.m7.u2
+                bus_extra_params_image1 = "iothread=iothread0"
     variants:
         - simple_test:
             type = live_snapshot_negative