qemu: deprecate QEMU_CAPS_DISPLAY

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

src/qemu/qemu_capabilities.c

@@ -3619,16 +3619,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
@@ -3758,8 +3748,6 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
     qemuCaps->package = package;
     qemuCaps->usedQMP = true;
 
-    virQEMUCapsInitQMPBasic(qemuCaps);
-
     if (virQEMUCapsInitQMPArch(qemuCaps, mon) < 0)
         goto cleanup;
 

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 */

src/qemu/qemu_command.c

@@ -9824,12 +9824,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
      * these defaults ourselves...
      */
     if (!def->ngraphics) {
-        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISPLAY)) {
+        virCommandAddArg(cmd, "-display");
-            virCommandAddArg(cmd, "-display");
+        virCommandAddArg(cmd, "none");
-            virCommandAddArg(cmd, "none");
-        } else {
-            virCommandAddArg(cmd, "-nographic");
-        }
 
         if (cfg->nogfxAllowHostAudio)
             virCommandAddEnvPassBlockSUID(cmd, "QEMU_AUDIO_DRV", NULL);

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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,\

tests/qemuxml2argvdata/aarch64-acpi-uefi.args

@@ -16,7 +16,7 @@ unit=1 \
 -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,path=/tmp/lib/domain--1-guest/monitor.sock,\

tests/qemuxml2argvdata/aarch64-cpu-passthrough.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,\

tests/qemuxml2argvdata/aarch64-gic-host.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\

tests/qemuxml2argvdata/aarch64-gic-none-tcg.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-guest/monitor.sock,\

tests/qemuxml2argvdata/aarch64-gic-v2.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\

tests/qemuxml2argvdata/aarch64-gic-v3.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\

tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\

tests/qemuxml2argvdata/aarch64-noacpi-nouefi.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,path=/tmp/lib/domain--1-guest/monitor.sock,\

tests/qemuxml2argvdata/aarch64-noacpi-uefi.args

@@ -16,7 +16,7 @@ unit=1 \
 -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,path=/tmp/lib/domain--1-guest/monitor.sock,\

tests/qemuxml2argvdata/aarch64-pci-serial.args

@@ -11,7 +11,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,\

tests/qemuxml2argvdata/aarch64-traditional-pci.args

@@ -11,7 +11,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,path=/tmp/lib/domain--1-guest/monitor.sock,\

tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid f3197c89-6457-44fe-b26d-897090ba6541 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\

tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.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,\

tests/qemuxml2argvdata/aarch64-virt-default-nic.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,\

tests/qemuxml2argvdata/aarch64-virt-virtio.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,\

tests/qemuxml2argvdata/aarch64-virtio-pci-default.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,\

tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.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,\

tests/qemuxml2argvdata/acpi-table.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/arm-vexpressa9-basic.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\

tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\

tests/qemuxml2argvdata/arm-vexpressa9-virtio.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\

tests/qemuxml2argvdata/arm-virt-virtio.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-armtest/monitor.sock,\

tests/qemuxml2argvdata/autoindex.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 2048 \
 -smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-q35-test/monitor.sock,\

tests/qemuxml2argvdata/balloon-ccw-deflate.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/balloon-device-auto.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/balloon-device-deflate-off.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/balloon-device-deflate.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/balloon-device-period.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/balloon-device.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/balloon-mmio-deflate.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,\

tests/qemuxml2argvdata/bios-nvram-secure.args

@@ -15,7 +15,7 @@ readonly=on \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\

tests/qemuxml2argvdata/bios-nvram.args

@@ -14,7 +14,7 @@ readonly=on \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-test-bios/monitor.sock,\

tests/qemuxml2argvdata/bios.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -device sga \

tests/qemuxml2argvdata/blkdeviotune-group-num.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/blkdeviotune-max-length.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/blkdeviotune-max.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/blkiotune-device.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/blkiotune.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-cdrom.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-complex-bootindex.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-complex.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-floppy-q35.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-floppy.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-menu-disable-drive-bootindex.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-menu-disable-drive.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-menu-disable.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-menu-enable-bootindex.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-menu-enable.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-multi.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-network.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-order.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/boot-strict.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/bootindex-floppy-q35.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/channel-guestfwd.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/channel-virtio-auto.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/channel-virtio-autoadd.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/channel-virtio-autoassign.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/channel-virtio-default.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/channel-virtio-state.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/channel-virtio-unix.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/channel-virtio.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/chardev-reconnect.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/clock-catchup.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/clock-france.args

@@ -12,7 +12,7 @@ TZ=Europe/Paris \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/clock-hpet-off.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/clock-localtime-basis-localtime.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/clock-localtime.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\

tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args

@@ -12,7 +12,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--nographic \
+-display none \
 -no-user-config \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\