From patchwork Fri Jun 18 00:14:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Goldish X-Patchwork-Id: 106775 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 o5I0FEhf015928 for ; Fri, 18 Jun 2010 00:15:14 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760887Ab0FRAPF (ORCPT ); Thu, 17 Jun 2010 20:15:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26053 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760528Ab0FRAO6 (ORCPT ); Thu, 17 Jun 2010 20:14:58 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5I0EvCo004178 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 17 Jun 2010 20:14:57 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5I0Eu09016396; Thu, 17 Jun 2010 20:14:56 -0400 Received: from localhost.localdomain (dhcp-1-188.tlv.redhat.com [10.35.1.188]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id o5I0EljM005733; Thu, 17 Jun 2010 20:14:55 -0400 From: Michael Goldish To: autotest@test.kernel.org, kvm@vger.kernel.org Cc: Michael Goldish Subject: [KVM-AUTOTEST PATCH 06/18] [RFC] KVM test: tests_base.cfg.sample: remove noacpi, userirq variants Date: Fri, 18 Jun 2010 03:14:23 +0300 Message-Id: <1276820075-31310-6-git-send-email-mgoldish@redhat.com> In-Reply-To: <1276820075-31310-5-git-send-email-mgoldish@redhat.com> References: <1276820075-31310-1-git-send-email-mgoldish@redhat.com> <1276820075-31310-2-git-send-email-mgoldish@redhat.com> <1276820075-31310-3-git-send-email-mgoldish@redhat.com> <1276820075-31310-4-git-send-email-mgoldish@redhat.com> <1276820075-31310-5-git-send-email-mgoldish@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 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]); Fri, 18 Jun 2010 00:15:14 +0000 (UTC) diff --git a/client/tests/kvm/tests.cfg.sample b/client/tests/kvm/tests.cfg.sample index e0d4271..a55a320 100644 --- a/client/tests/kvm/tests.cfg.sample +++ b/client/tests/kvm/tests.cfg.sample @@ -34,8 +34,6 @@ variants: only rtl8139 # Only ide hard drives only ide - # acpi means that acpi and kvm irq chip are enabled - only acpi # qemu-kvm will start only with -smp 2 (2 processors) only smp2 # No PCI assignable devices @@ -55,7 +53,6 @@ variants: # The default nw card for qemu is e1000 only e1000 only ide - only acpi # qemu using kvm doesn't support smp yet only up only no_pci_assignable @@ -72,7 +69,6 @@ variants: only qcow2 only rtl8139 only ide - only acpi only smp2 only no_pci_assignable only smallpages diff --git a/client/tests/kvm/tests_base.cfg.sample b/client/tests/kvm/tests_base.cfg.sample index cabeb4a..ec61a5e 100644 --- a/client/tests/kvm/tests_base.cfg.sample +++ b/client/tests/kvm/tests_base.cfg.sample @@ -1384,18 +1384,6 @@ variants: variants: - - @acpi: - - noacpi: - only Fedora Ubuntu Windows - no WinVista Win2008 - no smp2.*Windows - extra_params += " -no-acpi" - - userirq: - only Fedora Ubuntu Windows - extra_params += " -no-kvm-irqchip -no-kvm-pit" - - -variants: - @ide: drive_format=ide - scsi: @@ -1422,14 +1410,12 @@ variants: only Fedora Ubuntu Windows only smp2 only rtl8139 - only acpi image_format = vmdk - raw: no ioquit only Fedora Ubuntu Windows only smp2 only rtl8139 - only acpi image_format = raw