Merge autotest upstream from @5318 ~ @5336

client/tests/kvm/build.cfg.sample

 # Copy this file to build.cfg and edit it.
 #
 # This configuration file holds the KVM build test config parameters.
 # The default is noinstall (won't attempt to build KVM), so if you stick with it
 # please make sure:
 # 1) You have setup symbolic links to qemu and qemu-img binaries on the
 #    KVM test dir.
 # 2) The appropriate KVM modules are already loaded on your machine.
 
+vm_type = kvm
+
 variants:
     - build:
         type = build
         # Load modules built/installed by the build test?
         load_modules = no
         # Save the results of this build on test.resultsdir?
         save_results = no
         variants:
             - release:
                 install_mode = release
@@ skipping 86 matching lines @@
                 ## Name of the rpms we need installed
                 pkg_list = ['qemu-kvm', 'qemu-kvm-tools', 'qemu-system-x86', 'qemu-common', 'qemu-img']
                 ## Paths of the qemu relevant executables that should be checked
                 qemu_bin_paths = ['/usr/bin/qemu-kvm', '/usr/bin/qemu-img']
 
 
 # Choose your install method here. The variant noinstall is not defined by
 # default, so therefore no attempt to build/install KVM will be made by
 # default
 only build.noinstall