Seperate smp from extra_params and add into default VM params

Commit Message

Yolkfull Chow Nov. 3, 2009, 6:27 a.m. UTC

None

Patch

diff --git a/client/tests/kvm/kvm_tests.cfg.sample b/client/tests/kvm/kvm_tests.cfg.sample
index 573206c..c16b615 100644
--- a/client/tests/kvm/kvm_tests.cfg.sample
+++ b/client/tests/kvm/kvm_tests.cfg.sample
@@ -18,6 +18,7 @@  kill_unresponsive_vms = yes
 # Some default VM params
 qemu_binary = qemu
 qemu_img_binary = qemu-img
+smp = 1
 mem = 512
 image_size = 10G
 shell_port = 22
@@ -751,7 +752,7 @@  variants:
     - @up:
         no autotest.npb
     - smp2:
-        extra_params += " -smp 2"
+        smp = 2
         used_cpus = 2
         stress_boot: used_cpus = 10
         timedrift.with_load: used_cpus = 100
diff --git a/client/tests/kvm/kvm_vm.py b/client/tests/kvm/kvm_vm.py
index ee6796b..0b7a81e 100755
--- a/client/tests/kvm/kvm_vm.py
+++ b/client/tests/kvm/kvm_vm.py
@@ -261,6 +261,10 @@  class VM:
         if mem:
             qemu_cmd += " -m %s" % mem
 
+        smp = params.get("smp")
+        if smp:
+            qemu_cmd += " -smp %s" % smp
+
         iso = params.get("cdrom")
         if iso:
             iso = kvm_utils.get_path(root_dir, iso)