qemu: capabilities: Un-retire QEMU_CAPS_EGL_HEADLESS

egl-headless graphics can be compiled out in qemu so we need to be able to know whether the given qemu version support it. Base the capability on the presence of the 'egl-headless' member in 'query-display-options' or imply it if 'query-display-options' is not supported as we implied it before for all versions. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Thomas Huth <thuth@redhat.com>
2025-02-01 17:35:17 +00:00 · 2021-06-15 11:38:26 +02:00 · 2021-06-15 11:38:26 +02:00 · 4808323994
commit 4808323994
parent 68940b3fb3
40 changed files with 43 additions and 2 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -1577,6 +1577,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
    { "blockdev-backup", QEMU_CAPS_BLOCKDEV_BACKUP },
    { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_QAPIFIED },
    { "query-display-options/ret-type/+sdl", QEMU_CAPS_SDL },
+    { "query-display-options/ret-type/+egl-headless", QEMU_CAPS_EGL_HEADLESS },
 };

 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
@ -5145,8 +5146,10 @@ virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps)
 {
    /* versions prior to the introduction of 'query-display-options' had SDL
     * mostly compiled in */
-    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_DISPLAY_OPTIONS))
+    if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_DISPLAY_OPTIONS)) {
        virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
+        virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
+    }

    if (ARCH_IS_X86(qemuCaps->arch) &&
        virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -483,7 +483,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    /* 310 */
    QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, /* -machine pseries.cap-htm */
    QEMU_CAPS_USB_STORAGE_WERROR, /* -device usb-storage,werror=..,rerror=.. */
-    X_QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
+    QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
    QEMU_CAPS_VFIO_PCI_DISPLAY, /* -device vfio-pci.display */
    QEMU_CAPS_BLOCKDEV, /* -blockdev and blockdev-add are supported */

--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -101,6 +101,7 @@
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
  <flag name='tpm-emulator'/>
+  <flag name='egl-headless'/>
  <flag name='zpci'/>
  <flag name='iothread.poll-max-ns'/>
  <flag name='query-cpu-model-baseline'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -179,6 +179,7 @@
  <flag name='tpm-emulator'/>
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
+  <flag name='egl-headless'/>
  <flag name='iothread.poll-max-ns'/>
  <flag name='x86-max-cpu'/>
  <flag name='i8042'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -142,6 +142,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -139,6 +139,7 @@
  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='machine.pseries.cap-htm'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -108,6 +108,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='zpci'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -183,6 +183,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='sev-guest'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -139,6 +139,7 @@
  <flag name='tpm-emulator'/>
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -81,6 +81,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
+  <flag name='egl-headless'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
  <flag name='iothread.poll-max-ns'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -81,6 +81,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
+  <flag name='egl-headless'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
  <flag name='iothread.poll-max-ns'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -110,6 +110,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='zpci'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -185,6 +185,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -141,6 +141,7 @@
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -185,6 +185,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -143,6 +143,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -147,6 +147,7 @@
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -146,6 +146,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -146,6 +146,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -109,6 +109,7 @@
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='vfio-ap'/>
  <flag name='zpci'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -184,6 +184,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -184,6 +184,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -145,6 +145,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -147,6 +147,7 @@
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -109,6 +109,7 @@
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='vfio-ap'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -185,6 +185,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -148,6 +148,7 @@
  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -150,6 +150,7 @@
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -146,6 +146,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -185,6 +185,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -72,6 +72,7 @@
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='chardev-fd-pass'/>
+  <flag name='egl-headless'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
  <flag name='memory-backend-memfd.hugetlb'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -184,6 +184,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -147,6 +147,7 @@
  <flag name='chardev-fd-pass'/>
  <flag name='tpm-emulator'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -148,6 +148,7 @@
  <flag name='machine.pseries.cap-hpt-max-page-size'/>
  <flag name='machine.pseries.cap-htm'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -144,6 +144,7 @@
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -107,6 +107,7 @@
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='vfio-ap'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -184,6 +184,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -107,6 +107,7 @@
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
  <flag name='chardev-fd-pass'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='vfio-ap'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -184,6 +184,7 @@
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='sev-guest'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -182,6 +182,7 @@
  <flag name='mch'/>
  <flag name='mch.extended-tseg-mbytes'/>
  <flag name='usb-storage.werror'/>
+  <flag name='egl-headless'/>
  <flag name='vfio-pci.display'/>
  <flag name='blockdev'/>
  <flag name='memory-backend-memfd'/>