Merge remote branch 'autotest-upstream/master' into autotest-merge

client/tests/kvm/tests.cfg.sample

 # Copy this file to tests.cfg and edit it.
 #
 # This file contains the test set definitions. Define your test sets here.
 include tests_base.cfg
 include cdkeys.cfg
 
 # Modify/comment the following lines if you wish to modify the paths of the
 # image files, ISO files or qemu binaries.
 #
 # As for the defaults:
@@ skipping 56 matching lines @@
         only unattended_install.cdrom, boot, shutdown
         # qemu needs -enable-kvm on the cmdline
         extra_params += ' -enable-kvm'
 
     # Runs qemu-kvm, f14 64 bit guest OS, install, boot, shutdown
     - @qemu_kvm_f14_quick:
         # We want qemu-kvm for this run
         qemu_binary = /usr/bin/qemu-kvm
         qemu_img_binary = /usr/bin/qemu-img
         only qcow2
-        only virtio_net
-        only virtio_blk
+        only rtl8139
+        only ide
         only smp2
         only no_pci_assignable
         only smallpages
         only Fedora.14.64
         only unattended_install.cdrom, boot, shutdown
 
 # You may provide information about the DTM server for WHQL tests here:
 #whql:
 #    server_address = 10.20.30.40
 #    server_shell_port = 10022
 #    server_file_transfer_port = 10023
 # Note that the DTM server must run rss.exe (available under deps/),
 # preferably with administrator privileges.
 
 # Uncomment the following lines to enable abort-on-error mode:
 #abort_on_error = yes
 #kill_vm.* ?= no
 #kill_unresponsive_vms.* ?= no
 
 # Choose your test list from the testsets defined
 only qemu_kvm_f14_quick