From patchwork Tue Mar 23 13:31:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 87625 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2NDW0Rl030650 for ; Tue, 23 Mar 2010 13:32:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753363Ab0CWNb6 (ORCPT ); Tue, 23 Mar 2010 09:31:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49828 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753095Ab0CWNb6 (ORCPT ); Tue, 23 Mar 2010 09:31:58 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2NDVql7007922 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 23 Mar 2010 09:31:53 -0400 Received: from localhost.localdomain (batcave.lab.eng.brq.redhat.com [10.34.33.79]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o2NDVpXW021744; Tue, 23 Mar 2010 09:31:51 -0400 From: Jes Sorensen To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Jes Sorensen Subject: [PATCH] autotest - make KVM tests explicitly pick qemu vs qemu-kvm depending on the test. Date: Tue, 23 Mar 2010 14:31:16 +0100 Message-Id: <1269351076-12388-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 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.3 (demeter.kernel.org [140.211.167.41]); Tue, 23 Mar 2010 13:32:01 +0000 (UTC) diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample index b86b6c4..97468d9 100644 --- a/client/tests/kvm/tests.cfg.sample +++ b/client/tests/kvm/tests.cfg.sample @@ -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