Merge pull request #1217 from vivianQizhu/machine

uttended_install.cfg: Specify cd_format here instead of in machine.cfg

generic/tests/cfg/unattended_install.cfg

@@ -119,6 +119,10 @@
     variants:
         # Additional iso with kickstart is attached into the guest
         - extra_cdrom_ks:
+            i440fx:
+                cd_format = ide
+            q35:
+                cd_format = ahci
             no WinXP Win2000 Win2003 WinVista
             unattended_delivery_method = cdrom
             cdroms += " unattended"
@@ -158,6 +162,10 @@
             # TODO: is this needed for both kvm and libvirt?
             # This option is only used in windows installation case,
             # since linux use kernel/initrd option of qemu.
+            i440fx:
+                cd_format = ide
+            q35:
+                cd_format = ahci
             boot_once = d
             medium = cdrom
             redirs += " unattended_install"