|
 |
3e5111 |
From 0494070eee0b3145ef3a0bfb4c29933aaa1a91af Mon Sep 17 00:00:00 2001
|
|
|
3e5111 |
Message-Id: <0494070eee0b3145ef3a0bfb4c29933aaa1a91af@dist-git>
|
|
|
3e5111 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
3e5111 |
Date: Tue, 4 Apr 2017 14:59:29 +0200
|
|
|
3e5111 |
Subject: [PATCH] qemu: Remove redundant capabilities
|
|
|
3e5111 |
|
|
|
3e5111 |
Now that the NO_ACPI and NO_HPET capabilities are set
|
|
|
3e5111 |
automatically by virQEMUCapsInitQMPBasicArch() if
|
|
|
3e5111 |
appropriate for the architecture, they shouldn't be
|
|
|
3e5111 |
used manually to avoid masking bugs.
|
|
|
3e5111 |
|
|
|
3e5111 |
(cherry picked from commit 5fbb16ba5355ce4361bdd361bd200beb7627b7b9)
|
|
|
3e5111 |
|
|
|
3e5111 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1429509
|
|
|
3e5111 |
|
|
|
3e5111 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
3e5111 |
---
|
|
|
3e5111 |
tests/qemuxml2argvtest.c | 10 ++++------
|
|
|
3e5111 |
1 file changed, 4 insertions(+), 6 deletions(-)
|
|
|
3e5111 |
|
|
|
3e5111 |
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
|
|
|
3e5111 |
index 731b793c4..5c0e1e8ab 100644
|
|
|
3e5111 |
--- a/tests/qemuxml2argvtest.c
|
|
|
3e5111 |
+++ b/tests/qemuxml2argvtest.c
|
|
|
3e5111 |
@@ -762,9 +762,8 @@ mymain(void)
|
|
|
3e5111 |
DO_TEST("clock-localtime-basis-localtime", QEMU_CAPS_RTC);
|
|
|
3e5111 |
DO_TEST("clock-variable", QEMU_CAPS_RTC);
|
|
|
3e5111 |
DO_TEST("clock-france", QEMU_CAPS_RTC);
|
|
|
3e5111 |
- DO_TEST("clock-hpet-off", QEMU_CAPS_RTC, QEMU_CAPS_NO_HPET,
|
|
|
3e5111 |
- QEMU_CAPS_NO_KVM_PIT);
|
|
|
3e5111 |
- DO_TEST("clock-catchup", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT);
|
|
|
3e5111 |
+ DO_TEST("clock-hpet-off", QEMU_CAPS_RTC);
|
|
|
3e5111 |
+ DO_TEST("clock-catchup", QEMU_CAPS_RTC);
|
|
|
3e5111 |
DO_TEST("cpu-kvmclock", QEMU_CAPS_ENABLE_KVM);
|
|
|
3e5111 |
DO_TEST("cpu-host-kvmclock", QEMU_CAPS_ENABLE_KVM);
|
|
|
3e5111 |
DO_TEST("kvmclock", QEMU_CAPS_KVM);
|
|
|
3e5111 |
@@ -797,7 +796,7 @@ mymain(void)
|
|
|
3e5111 |
DO_TEST("pmu-feature-off", NONE);
|
|
|
3e5111 |
|
|
|
3e5111 |
DO_TEST("hugepages", QEMU_CAPS_MEM_PATH);
|
|
|
3e5111 |
- DO_TEST("hugepages-numa", QEMU_CAPS_RTC, QEMU_CAPS_NO_KVM_PIT,
|
|
|
3e5111 |
+ DO_TEST("hugepages-numa", QEMU_CAPS_RTC,
|
|
|
3e5111 |
QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
|
|
|
3e5111 |
QEMU_CAPS_VIRTIO_SCSI,
|
|
|
3e5111 |
QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_PCI_MULTIFUNCTION,
|
|
|
3e5111 |
@@ -1990,7 +1989,6 @@ mymain(void)
|
|
|
3e5111 |
DO_TEST("q35-virt-manager-basic",
|
|
|
3e5111 |
QEMU_CAPS_KVM,
|
|
|
3e5111 |
QEMU_CAPS_RTC,
|
|
|
3e5111 |
- QEMU_CAPS_NO_KVM_PIT,
|
|
|
3e5111 |
QEMU_CAPS_ICH9_DISABLE_S3,
|
|
|
3e5111 |
QEMU_CAPS_ICH9_DISABLE_S4,
|
|
|
3e5111 |
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY,
|
|
|
3e5111 |
@@ -2322,7 +2320,7 @@ mymain(void)
|
|
|
3e5111 |
|
|
|
3e5111 |
DO_TEST("kvm-pit-delay", QEMU_CAPS_KVM_PIT_TICK_POLICY);
|
|
|
3e5111 |
DO_TEST("kvm-pit-discard", QEMU_CAPS_KVM_PIT_TICK_POLICY);
|
|
|
3e5111 |
- DO_TEST("no-kvm-pit-device", QEMU_CAPS_NO_KVM_PIT);
|
|
|
3e5111 |
+ DO_TEST("no-kvm-pit-device", NONE);
|
|
|
3e5111 |
|
|
|
3e5111 |
DO_TEST("panic", QEMU_CAPS_DEVICE_PANIC,
|
|
|
3e5111 |
QEMU_CAPS_NODEFCONFIG);
|
|
|
3e5111 |
--
|
|
|
3e5111 |
2.12.2
|
|
|
3e5111 |
|