Skip to contentSkip to conversation

KVM test: make KVM tests explicitly pick qemu vs qemu-kvm depending on the test.

PATCH New Lucas Meneghel Rodrigues 1 participant 1 message Mar 23, 2010 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 KVM test: make KVM tests explicitly pick qemu vs qemu-kvm depending on the test.

From: Jes Sorensen <[email protected]>

Make KVM tests explicitly pick qemu vs qemu-kvm depending on the test, rather than relying on a global variable for it.

---
 client/tests/kvm/tests.cfg.sample |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
client/tests/kvm/tests.cfg.sample +6 -1
index b86b6c4..97468d9 100644
@@ -13,7 +13,6 @@ include cdkeys.cfg
 # * All image files are expected under /tmp/kvm_autotest_root/images/
 # * All iso files are expected under /tmp/kvm_autotest_root/isos/
 # * All step files are expected under /tmp/kvm_autotest_root/steps/
-qemu_binary = /usr/bin/qemu-kvm
 qemu_img_binary = /usr/bin/qemu-img
 image_name.* ?<= /tmp/kvm_autotest_root/
 cdrom.* ?<= /tmp/kvm_autotest_root/
@@ -27,6 +26,8 @@ variants:
 
     # Runs qemu-kvm, Windows Vista 64 bit guest OS, install, boot, shutdown
     - @qemu_kvm_windows_quick:
+        # We want qemu-kvm for this run
+        qemu_binary = /usr/bin/qemu-kvm
         # Only qcow2 file format
         only qcow2
         # Only rtl8139 for nw card (default on qemu-kvm)
@@ -48,6 +49,8 @@ variants:
 
     # Runs qemu, f12 64 bit guest OS, install, boot, shutdown
     - @qemu_f12_quick:
+        # We want qemu for this run
+        qemu_binary = /usr/bin/qemu
         only qcow2
         # The default nw card for qemu is e1000
         only e1000
@@ -64,6 +67,8 @@ variants:
 
     # Runs qemu-kvm, f12 64 bit guest OS, install, boot, shutdown
     - @qemu_kvm_f12_quick:
+        # We want qemu-kvm for this run
+        qemu_binary = /usr/bin/qemu-kvm
         only qcow2
         only rtl8139
         only ide
Signature · 1 line
1.7.0.1