AFAIK there is very little interest in these variants, so make all tests use
the default options (acpi enabled). Note that you shouldn't use 'only acpi'
now because the acpi variant is no longer defined.
Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
---
client/tests/kvm/tests.cfg.sample | 4 ----
client/tests/kvm/tests_base.cfg.sample | 14 --------------
2 files changed, 0 insertions(+), 18 deletions(-)
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
--
1.5.4.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
