External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 23:37:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to virQEMUCapsInitQMPBasicArch

Browse Source 
It's now always set for AARCH64, move it into the function setting basic
caps for the emulator.

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:15:06 +02:00
parent 0dbf53372f
commit d60faa4580
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_capabilities.c
View File

@ -5063,6 +5063,9 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps)
case VIR_ARCH_AARCH64: case VIR_ARCH_AARCH64:
/* ACPI only works on x86 and aarch64 */ /* ACPI only works on x86 and aarch64 */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_ACPI);
/* -cpu ...,aarch64=off is not detectable via qmp at this point */
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
break; break;
case VIR_ARCH_PPC64: case VIR_ARCH_PPC64:
@ -5126,11 +5129,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS); virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS);
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST); virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
/* -cpu ...,aarch64=off supported in v2.3.0 and onwards. But it
isn't detectable via qmp at this point */
if (qemuCaps->arch == VIR_ARCH_AARCH64)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_AARCH64_OFF);
if (ARCH_IS_PPC64(qemuCaps->arch)) { if (ARCH_IS_PPC64(qemuCaps->arch)) {
/* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately /* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately
* there's no sane way to probe for it */ * there's no sane way to probe for it */