qemu: capabilities: Move rest of always present caps to virQEMUCapsInitQMPArch

These conveniently don't have any test fallout.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index a9f662e635ba69ed99a609cb900f4fb090e4c972..4c13728d5c8072d83c328fc8844a061b68bd4aaf 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5053,6 +5053,13 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *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:
@@ -5129,15 +5136,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
 static void
 virQEMUCapsInitQMPVersionCaps(virQEMUCaps *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