External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 12:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peter Krempa 2021-03-30 17:40:49 +02:00
parent dff41d5553
commit 64ee4b2e45
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_capabilities.c
View File

@ -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