From patchwork Wed Apr 27 03:19:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 735261 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3R3K80v006999 for ; Wed, 27 Apr 2011 03:20:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754162Ab1D0DUF (ORCPT ); Tue, 26 Apr 2011 23:20:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31636 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754031Ab1D0DT7 (ORCPT ); Tue, 26 Apr 2011 23:19:59 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3R3Jwcf007926 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 26 Apr 2011 23:19:58 -0400 Received: from freedom.redhat.com (vpn-9-62.rdu.redhat.com [10.11.9.62]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3R3JhIa032053; Tue, 26 Apr 2011 23:19:57 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 3/7] KVM test: tests_base.cfg: Introduce parameter 'vm_type' Date: Wed, 27 Apr 2011 00:19:36 -0300 Message-Id: <1303874380-18137-4-git-send-email-lmr@redhat.com> In-Reply-To: <1303874380-18137-1-git-send-email-lmr@redhat.com> References: <1303874380-18137-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 27 Apr 2011 03:20:09 +0000 (UTC) In order to allow the shared infrastructure to select the correct vm class to instantiate a VM, introduce the parameter vm_type, which for kvm based VMs is, not surprisingly, 'kvm'. Signed-off-by: Lucas Meneghel Rodrigues --- client/tests/kvm/build.cfg.sample | 2 ++ client/tests/kvm/tests_base.cfg.sample | 1 + client/tests/kvm/unittests.cfg.sample | 1 + 3 files changed, 4 insertions(+), 0 deletions(-) diff --git a/client/tests/kvm/build.cfg.sample b/client/tests/kvm/build.cfg.sample index a689ed4..a43c0e9 100644 --- a/client/tests/kvm/build.cfg.sample +++ b/client/tests/kvm/build.cfg.sample @@ -7,6 +7,8 @@ # KVM test dir. # 2) The appropriate KVM modules are already loaded on your machine. +vm_type = kvm + variants: - build: type = build diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index 5d274f8..810a4bd 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -2,6 +2,7 @@ # # Define the objects we'll be using vms = vm1 +vm_type = kvm images = image1 cdroms = cd1 nics = nic1 diff --git a/client/tests/kvm/unittests.cfg.sample b/client/tests/kvm/unittests.cfg.sample index 3d32cb2..44f0eee 100644 --- a/client/tests/kvm/unittests.cfg.sample +++ b/client/tests/kvm/unittests.cfg.sample @@ -2,6 +2,7 @@ # # Define the objects we'll be using vms = vm1 +vm_type = kvm # Choose the main VM main_vm = vm1