[RFC PATCH 31/43] qemu: capabilities: Move rest of always present caps to virQEMUCapsInitQMPArch

[Peter Krempa]

These conveniently don't have any test fallout.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_capabilities.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 36836cad3d..af0bb398e4 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5049,6 +5049,13 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
 {
     /* Following caps were asserted by a version check for pre 2.11 qemus */
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
+    virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
+    virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
+    virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
+    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);

     switch (qemuCaps->arch) {
     case VIR_ARCH_I686:
@@ -5125,15 +5132,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCapsPtr qemuCaps)
 static void
 virQEMUCapsInitQMPVersionCaps(virQEMUCapsPtr qemuCaps)
 {
-    /* Following caps were asserted by a version check for pre 2.11 qemus */
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_VMPORT_OPT);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOSTUSER_MULTIQUEUE);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_SMM_OPT);
-    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);
-
     /* -enable-fips is deprecated in QEMU 5.2.0, and QEMU
      * should be built with gcrypt to achieve FIPS compliance
      * automatically / implicitly
-- 
2.30.2