[PATCH 20/38] qemu: capabilities: Move rest of always present caps to virQEMUCapsInitQMPArch

These conveniently don't have any test fallout. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; Reviewed-by: Pavel Hrdina <phrdina(a)redhat.com&gt; Reviewed-by: Neal Gompa <ngompa13(a)gmail.com&gt; --- 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 61dd4fd6f8..0ac68197a3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5044,6 +5044,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: @@ -5120,15 +5127,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 -- 2.30.2