[libvirt] [libvirt PATCH v2 43/44] Deprecate QEMU_CAPS_DISPLAY
Ján Tomko
jtomko at redhat.com
Mon Apr 9 15:27:50 UTC 2018
Implied by QEMU >= 1.2.0.
Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
src/qemu/qemu_capabilities.c | 12 ------------
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 8 ++------
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 -
tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
tests/qemuxml2argvdata/watchdog-injectnmi.args | 2 +-
[ ... ]
tests/qemuxml2argvdata/watchdog.args | 2 +-
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 2 +-
tests/qemuxml2argvtest.c | 3 +--
tests/qemuxml2xmltest.c | 3 +--
597 files changed, 572 insertions(+), 615 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8c77449bde..59456b2d5d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -3623,16 +3623,6 @@ static qemuMonitorCallbacks callbacks = {
};
-/* Capabilities that we assume are always enabled
- * for QEMU >= 1.2.0
- */
-static void
-virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
-{
- virQEMUCapsSet(qemuCaps, QEMU_CAPS_DISPLAY);
-}
-
-
/**
* virQEMUCapsInitQMPArch:
* @qemuCaps: QEMU capabilities
@@ -3762,8 +3752,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
qemuCaps->package = package;
qemuCaps->usedQMP = true;
- virQEMUCapsInitQMPBasic(qemuCaps);
-
if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0)
goto cleanup;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 5a19494659..594cc19213 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -371,7 +371,7 @@ typedef enum {
QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */
/* 230 */
- QEMU_CAPS_DISPLAY, /* -display */
+ X_QEMU_CAPS_DISPLAY, /* -display */
QEMU_CAPS_DEVICE_INTEL_IOMMU, /* -device intel-iommu */
QEMU_CAPS_MACHINE_SMM_OPT, /* -machine xxx,smm=on/off/auto */
QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, /* virtio-*pci.disable-legacy */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4376ab95ec..7061089b03 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9797,12 +9797,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
* these defaults ourselves...
*/
if (!def->ngraphics) {
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY)) {
- virCommandAddArg(cmd, "-display");
- virCommandAddArg(cmd, "none");
- } else {
- virCommandAddArg(cmd, "-nographic");
- }
+ virCommandAddArg(cmd, "-display");
+ virCommandAddArg(cmd, "none");
if (cfg->nogfxAllowHostAudio)
virCommandAddEnvPassBlockSUID(cmd, "QEMU_AUDIO_DRV", NULL);
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 376731e034..f49df85865 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -103,7 +103,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
- <flag name='display'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index a42f9d1d14..f9e2959b99 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -108,7 +108,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
- <flag name='display'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index cdae63e399..e8eaa7939b 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -110,7 +110,6 @@
<flag name='qxl.vram64_size_mb'/>
<flag name='device-tray-moved-event'/>
<flag name='nec-usb-xhci-ports'/>
- <flag name='display'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='kernel-irqchip'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 1f79a696cf..7892381f34 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -125,7 +125,6 @@
<flag name='nec-usb-xhci-ports'/>
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
- <flag name='display'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-definitions'/>
<flag name='query-named-block-nodes'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 0f4c00150a..cb60f7a3b5 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -118,7 +118,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index ba37abffb6..9704f84457 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -113,7 +113,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 032c556923..dc85732b25 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -82,7 +82,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index 708bc5de63..449cfcf05a 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index 8a94479032..0bc5479264 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -82,7 +82,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index edd3b4a623..46d6ab2ffa 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -118,7 +118,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 7cd37e9ff1..c0870d28b1 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -113,7 +113,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 12e1e68152..f7fe6646c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -82,7 +82,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index a9d9e713fe..9e148915cb 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -148,7 +148,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 2ff2906ccc..794ea38af4 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -141,7 +141,6 @@
<flag name='qxl.max_outputs'/>
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='machine-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 79e6df0b5c..8962aec411 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -146,7 +146,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='machine-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index c74931de44..687b5b9844 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -122,7 +122,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='drive-iotune-max-length'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 51d2d84e04..2bfb0ae493 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -115,7 +115,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='virtio-vga'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 9d8b547a6f..ac97bb5c3d 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='machine-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index e53336e2b5..97bc0bc25a 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -84,7 +84,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 6c9011e490..b66da6c78a 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index aba71b42b1..7f574e7f89 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -84,7 +84,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index a8343b9197..7fb3e9a819 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 42e7c1c27c..791019e3d6 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -112,7 +112,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index 218f8fcf8f..66eb5f9ced 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -82,7 +82,6 @@
<flag name='name-guest'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
<flag name='query-hotpluggable-cpus'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index a7facf9552..2397a19987 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -152,7 +152,6 @@
<flag name='spice-unix'/>
<flag name='drive-detect-zeroes'/>
<flag name='tls-creds-x509'/>
- <flag name='display'/>
<flag name='intel-iommu'/>
<flag name='smm'/>
<flag name='virtio-pci-disable-legacy'/>
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index ba4cadbac7..4ef4490f33 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-m 1024 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
--nographic \
+-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,\
[ ... etc ... ]
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index d7674e6b48..3cf06f370a 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
-m 4096 \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
--nographic \
+-display none \
-no-user-config \
-nodefaults \
-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-kvm/monitor.sock,server,\
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b4a36d7de7..b6b0b61ee5 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1109,8 +1109,7 @@ mymain(void)
DO_TEST("graphics-sdl-fullscreen",
QEMU_CAPS_DEVICE_CIRRUS_VGA);
DO_TEST("nographics", NONE);
- DO_TEST("nographics-display",
- QEMU_CAPS_DISPLAY);
+ DO_TEST("nographics-display", NONE);
DO_TEST("nographics-vga", NONE);
DO_TEST("graphics-spice",
QEMU_CAPS_SPICE,
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index ac01288cf0..ec107415b3 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -425,8 +425,7 @@ mymain(void)
DO_TEST("graphics-spice-auto-socket-cfg", NONE);
cfg->spiceAutoUnixSocket = false;
- DO_TEST("nographics-vga",
- QEMU_CAPS_DISPLAY);
+ DO_TEST("nographics-vga", NONE);
DO_TEST("input-usbmouse", NONE);
DO_TEST("input-usbtablet", NONE);
DO_TEST("misc-acpi", NONE);
--
2.16.1
More information about the libvir-list
mailing list