From patchwork Tue Nov 3 06:27:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yolkfull Chow X-Patchwork-Id: 57224 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA36Rxrt009007 for ; Tue, 3 Nov 2009 06:28:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751875AbZKCG1w (ORCPT ); Tue, 3 Nov 2009 01:27:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752205AbZKCG1w (ORCPT ); Tue, 3 Nov 2009 01:27:52 -0500 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 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nA36RuTn026853; Tue, 3 Nov 2009 01:27:56 -0500 Received: from localhost.localdomain (dhcp-65-181.nay.redhat.com [10.66.65.181]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nA36RrV3003639; Tue, 3 Nov 2009 01:27:55 -0500 From: Yolkfull Chow To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org 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)