qemu: capabilities: Retire QEMU_CAPS_SDL_GL

The feature is present in all supported qemu versions (>2.11) and there isn't a reasonable way to detect it. 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 · f69be987bc
commit f69be987bc
parent 78309f01a1
41 changed files with 4 additions and 53 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_SDL_GL);
    virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_KERNEL_IRQCHIP_SPLIT);
    virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
    virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -463,7 +463,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_CCW, /* -device virtual-css-bridge */
    QEMU_CAPS_CCW_CSSID_UNRESTRICTED, /* virtual-css-bridge.cssid-unrestricted= */
    QEMU_CAPS_DEVICE_VFIO_CCW, /* -device vfio-ccw */
-    QEMU_CAPS_SDL_GL, /* -sdl gl */
+    X_QEMU_CAPS_SDL_GL, /* -sdl gl */
    QEMU_CAPS_SCREENDUMP_DEVICE, /* screendump command accepts device & head */

    /* 300 */
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@ -4057,17 +4057,6 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics,
    }

    switch (graphics->type) {
-    case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-        if (graphics->data.sdl.gl != VIR_TRISTATE_BOOL_ABSENT) {
-            if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL_GL)) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                               _("OpenGL for SDL is not supported with this QEMU "
-                                 "binary"));
-                return -1;
-            }
-        }
-        break;
-
    case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
        if (qemuValidateDomainDeviceDefSPICEGraphics(graphics, driver,
                                                     qemuCaps) < 0)
@ -4092,6 +4081,7 @@ qemuValidateDomainDeviceDefGraphics(const virDomainGraphicsDef *graphics,

        break;

+    case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
    case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
    case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
    case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -99,7 +99,6 @@
  <flag name='nbd-tls'/>
  <flag name='pr-manager-helper'/>
  <flag name='virtual-css-bridge'/>
-  <flag name='sdl-gl'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
  <flag name='tpm-emulator'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -173,7 +173,6 @@
  <flag name='disk-write-cache'/>
  <flag name='nbd-tls'/>
  <flag name='pr-manager-helper'/>
-  <flag name='sdl-gl'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
  <flag name='vmgenid'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -137,7 +137,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -133,7 +133,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -104,7 +104,6 @@
  <flag name='virtual-css-bridge'/>
  <flag name='virtual-css-bridge.cssid-unrestricted'/>
  <flag name='vfio-ccw'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -174,7 +174,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -132,7 +132,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -77,7 +77,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -77,7 +77,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -106,7 +106,6 @@
  <flag name='virtual-css-bridge'/>
  <flag name='virtual-css-bridge.cssid-unrestricted'/>
  <flag name='vfio-ccw'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -176,7 +176,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -133,7 +133,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -176,7 +176,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -138,7 +138,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -140,7 +140,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -141,7 +141,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -141,7 +141,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -106,7 +106,6 @@
  <flag name='virtual-css-bridge'/>
  <flag name='virtual-css-bridge.cssid-unrestricted'/>
  <flag name='vfio-ccw'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -175,7 +175,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -175,7 +175,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -140,7 +140,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -140,7 +140,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -106,7 +106,6 @@
  <flag name='virtual-css-bridge'/>
  <flag name='virtual-css-bridge.cssid-unrestricted'/>
  <flag name='vfio-ccw'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -176,7 +176,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -142,7 +142,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -142,7 +142,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -141,7 +141,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -176,7 +176,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -70,7 +70,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='chardev-fd-pass'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -175,7 +175,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -141,7 +141,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -140,7 +140,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -139,7 +139,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -104,7 +104,6 @@
  <flag name='virtual-css-bridge'/>
  <flag name='virtual-css-bridge.cssid-unrestricted'/>
  <flag name='vfio-ccw'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='blockdev-del'/>
  <flag name='vhost-vsock'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -175,7 +175,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -174,7 +174,6 @@
  <flag name='pr-manager-helper'/>
  <flag name='qom-list-properties'/>
  <flag name='memory-backend-file.discard-data'/>
-  <flag name='sdl-gl'/>
  <flag name='screendump_device'/>
  <flag name='hda-output'/>
  <flag name='blockdev-del'/>
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@ -2492,8 +2492,7 @@ mymain(void)
            QEMU_CAPS_SPICE_RENDERNODE);
    DO_TEST("video-virtio-gpu-sdl-gl",
            QEMU_CAPS_DEVICE_VIRTIO_GPU,
-            QEMU_CAPS_VIRTIO_GPU_VIRGL,
-            QEMU_CAPS_SDL_GL);
+            QEMU_CAPS_VIRTIO_GPU_VIRGL);
    DO_TEST("video-virtio-gpu-secondary",
            QEMU_CAPS_DEVICE_VIRTIO_GPU);
    DO_TEST("video-virtio-vga",
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@ -1284,8 +1284,7 @@ mymain(void)
            QEMU_CAPS_SPICE_RENDERNODE);
    DO_TEST("video-virtio-gpu-sdl-gl",
            QEMU_CAPS_DEVICE_VIRTIO_GPU,
-            QEMU_CAPS_VIRTIO_GPU_VIRGL,
-            QEMU_CAPS_SDL_GL);
+            QEMU_CAPS_VIRTIO_GPU_VIRGL);

    DO_TEST("virtio-input",
            QEMU_CAPS_VIRTIO_KEYBOARD,