From: Yolkfull Chow Subject: [PATCH] Seperate smp from extra_params and add into default VM params Date: Tue, 3 Nov 2009 14:27:34 +0800 Message-ID: <1257229654-8015-1-git-send-email-yzhou@redhat.com> Cc: kvm@vger.kernel.org, Yolkfull Chow To: autotest@test.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:48683 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751716AbZKCG1w (ORCPT ); Tue, 3 Nov 2009 01:27:52 -0500 Sender: kvm-owner@vger.kernel.org List-ID: We may need leave smp as standalone parameter of VM. Reasons I can proposal: 1) memory is a standalone parameter, so is smp 2) smp parameter is needed in some test case, say VM params_verify Signed-off-by: Yolkfull Chow --- client/tests/kvm/kvm_tests.cfg.sample | 3 ++- client/tests/kvm/kvm_vm.py | 4 ++++ 2 files changed, 6 insertions(+), 1 deletions(-) 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) -- 1.6.5.1