[PATCH 35/38] 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(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_validate.c | 12 +----------- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.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_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 3 +-- tests/qemuxml2xmltest.c | 3 +-- 41 files changed, 4 insertions(+), 53 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 10499ff24c..55ed3c5f5c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5012,7 +5012,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); diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b50076fff8..8dfb572002 100644 --- 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 */ diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 9f8efe5a73..64b9b2fe5b 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4054,17 +4054,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) @@ -4089,6 +4078,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: diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index eb727d96fa..15d7351b5a 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 20af334b9a..600440a8fa 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index f62a2ef008..7e4c80dcd3 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 11d767d42b..c6a08f24db 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 10e760084d..e513140803 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index e363b8830d..162e998608 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index ca2b2e9f9c..e4ef9962b7 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index 3e82c02cee..9f979c8daa 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index a1cd4ca563..90ee6c226c 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 3183dfb069..f61705b586 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index afaeee1cbb..fab1f314b8 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index c7f0234f96..c392c6b2d9 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 0f96cb5f02..f8f3cfe6ac 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 44be1ba82a..8dfb5a4eed 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 0084d41141..6c07bcebeb 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 1546940318..65b3335f01 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index c3c6961e67..1bfbd182ba 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index 2801a66f78..4db4e2cfe4 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index c7fccdb001..7cc0fc1f1d 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 9ce9563053..14eedc1328 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 937c37179a..c47d86dbab 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 5ba846c7b7..656e03ae5e 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 7d1c593c75..7cea3cd380 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 2cde29b13a..b755a28f33 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 9c1ef89046..aafc606998 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 227e51b515..285f5bf442 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 1aaf8ccb88..a684809180 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 503dddf698..b15de30e5b 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 5b5e85a6d8..a5e320acc0 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 130821131e..d3ab98a108 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 24b7cc6e72..6944ff6474 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 25710b82f2..c1f2691463 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 0445ca65ca..cc7e04a5f1 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 3b8d0e7c27..5148591b10 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index d25b56e556..db0136b0f0 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 7424c123dc..da24669162 100644 --- 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'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 36b4d3e4bd..ec8f06bf5e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2490,8 +2490,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", diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 2585d659f4..b390c45ce2 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1283,8 +1283,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, -- 2.30.2