qemu: capabilities: Retire QEMU_CAPS_EGL_HEADLESS

The feature is present in all supported qemu versions (>2.11) and there isn't a reasonable way to detect it. In addition the capability wasn't even used to gate any functionality except for reporting the presence in the domain capabilities XML. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
2024-07-11 12:25:52 +00:00 · 2021-04-19 13:18:21 +02:00 · 2021-04-19 13:18:21 +02:00 · f20f266e66
commit f20f266e66
parent 994996ac9e
40 changed files with 2 additions and 46 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -5021,7 +5021,6 @@ void
 virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
 {
    /* Following caps were asserted by a version check for pre 2.11 qemus */
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
    virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);

    switch (qemuCaps->arch) {
@ -6068,8 +6067,7 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCaps *qemuCaps,
        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_VNC);
    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE))
        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SPICE);
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_EGL_HEADLESS))
-        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS);
+    VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS);
 }


--- 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=.. */
-    QEMU_CAPS_EGL_HEADLESS, /* -display egl-headless */
+    X_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,7 +101,6 @@
  <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,7 +179,6 @@
  <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,7 +142,6 @@
  <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,7 +139,6 @@
  <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,7 +108,6 @@
  <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,7 +183,6 @@
  <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,7 +139,6 @@
  <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,7 +81,6 @@
  <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,7 +81,6 @@
  <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,7 +110,6 @@
  <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,7 +185,6 @@
  <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,7 +141,6 @@
  <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,7 +185,6 @@
  <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,7 +143,6 @@
  <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,7 +147,6 @@
  <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,7 +146,6 @@
  <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,7 +146,6 @@
  <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,7 +109,6 @@
  <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,7 +184,6 @@
  <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,7 +184,6 @@
  <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,7 +145,6 @@
  <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,7 +147,6 @@
  <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,7 +109,6 @@
  <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,7 +185,6 @@
  <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,7 +148,6 @@
  <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,7 +150,6 @@
  <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,7 +146,6 @@
  <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,7 +185,6 @@
  <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,7 +72,6 @@
  <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,7 +184,6 @@
  <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,7 +147,6 @@
  <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,7 +148,6 @@
  <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,7 +144,6 @@
  <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,7 +107,6 @@
  <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,7 +184,6 @@
  <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.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -183,7 +183,6 @@
  <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/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@ -1494,7 +1494,6 @@ mymain(void)
    DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");

    DO_TEST("graphics-egl-headless",
-            QEMU_CAPS_EGL_HEADLESS,
            QEMU_CAPS_DEVICE_CIRRUS_VGA);
    DO_TEST_CAPS_LATEST("graphics-egl-headless");
    DO_TEST_CAPS_LATEST("graphics-egl-headless-rendernode");
@ -1539,7 +1538,6 @@ mymain(void)
    VIR_FREE(driver.config->vncTLSx509certdir);
    DO_TEST("graphics-vnc-egl-headless",
            QEMU_CAPS_VNC,
-            QEMU_CAPS_EGL_HEADLESS,
            QEMU_CAPS_DEVICE_CIRRUS_VGA);

    DO_TEST("graphics-sdl",
@ -1601,7 +1599,6 @@ mymain(void)
    driver.config->spiceAutoUnixSocket = false;
    DO_TEST("graphics-spice-egl-headless",
            QEMU_CAPS_SPICE,
-            QEMU_CAPS_EGL_HEADLESS,
            QEMU_CAPS_DEVICE_QXL);
    DO_TEST_CAPS_LATEST_PARSE_ERROR("graphics-spice-invalid-egl-headless");
    DO_TEST_CAPS_LATEST("graphics-spice-gl-auto-rendernode");
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@ -370,7 +370,6 @@ mymain(void)
            QEMU_CAPS_VNC);
    DO_TEST("graphics-vnc-egl-headless",
            QEMU_CAPS_DEVICE_CIRRUS_VGA,
-            QEMU_CAPS_EGL_HEADLESS,
            QEMU_CAPS_VNC);

    DO_TEST_CAPS_ARCH_LATEST("default-video-type-aarch64", "aarch64");
@ -414,12 +413,10 @@ mymain(void)
    cfg->spiceTLS = false;
    DO_TEST("graphics-spice-egl-headless",
            QEMU_CAPS_DEVICE_QXL,
-            QEMU_CAPS_EGL_HEADLESS,
            QEMU_CAPS_SPICE);

    DO_TEST("graphics-egl-headless-rendernode",
            QEMU_CAPS_DEVICE_CIRRUS_VGA,
-            QEMU_CAPS_EGL_HEADLESS,
            QEMU_CAPS_EGL_HEADLESS_RENDERNODE,
            QEMU_CAPS_DEVICE_CIRRUS_VGA);