Merge pull request #760 from xutian/fix_cdformat_q35

tests.cfg: add q35 support for windows driver related tests

qemu/tests/cfg/driver_load.cfg

@@ -38,6 +38,8 @@
 
         - with_block:
             drive_format_image1 = ide
+            q35:
+                drive_format_image1 = ahci
             images += " stg"
             image_name_stg = "images/storage"
             image_size_stg = 4G
@@ -51,6 +53,9 @@
         - with_vioscsi:
             cd_format_fixed = ide
             drive_format_image1 = ide
+            q35:
+                cd_format_fixed = ahci
+                drive_format_image1 = ahci
             images += " stg"
             image_name_stg = "images/storage"
             image_size_stg = 4G

qemu/tests/cfg/driver_load_stress.cfg

@@ -22,6 +22,8 @@
             driver_name = viostor
             run_bgstress = iozone_windows
             drive_format_image1 = ide
+            q35:
+                drive_format_image1 = ahci
             cdrom_cd1 = isos/windows/winutils.iso
             images += " stg"
             image_name_stg = "images/storage"
@@ -42,6 +44,9 @@
             run_bgstress = iozone_windows
             cd_format_fixed = ide
             drive_format_image1 = ide
+            q35:
+                cd_format_fixed = ahci
+                drive_format_image1 = ahci
             cdrom_cd1 = isos/windows/winutils.iso
             images += " stg"
             image_name_stg = "images/storage"

qemu/tests/cfg/single_driver_install.cfg

@@ -33,6 +33,8 @@
             driver_name = viostor
             device_name = "Red Hat VirtIO SCSI controller"
             drive_format_image1 = ide
+            q35:
+                drive_format_image1 = ide
             images += " stg"
             image_name_stg = "images/storage"
             image_size_stg = 4G
@@ -46,8 +48,11 @@
             no virtio_blk
             driver_name = vioscsi
             device_name = "Red Hat VirtIO SCSI pass-through controller"
-            cd_format_fixed =ide
+            cd_format_fixed = ide
             drive_format_image1 = ide
+            q35:
+                cd_format_fixed = ahci
+                drive_format_image1 = ahci
             images += " stg"
             image_name_stg = "images/storage"
             image_size_stg = 4G