From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 7 Nov 2022 14:01:35 +0000 (+0100)
Subject: qemu: Assume QEMU_CAPS_QUERY_DISPLAY_OPTIONS
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b9f70ae05ba6bb08ba30caf68f20f311762f8aa6;p=libvirt.git

qemu: Assume QEMU_CAPS_QUERY_DISPLAY_OPTIONS

Introduced in QEMU's commit of v3.1.0-rc3~8^2 the
query-display-options command is always available for all QEMU
versions we support (4.2.0, currently). Therefore, we can assume
the capability is always set and thus doesn't need to be checked
for.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 5393764844..b2c28b91ad 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5227,13 +5227,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps)
 static void
 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)) {
-        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)) {
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE);