From d60faa45801d6f24e6b69d31bb136bdc2cdb3b83 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 30 Mar 2021 17:15:06 +0200 Subject: [PATCH] qemu: capabilities: Move setting of QEMU_CAPS_CPU_AARCH64_OFF to virQEMUCapsInitQMPBasicArch It's now always set for AARCH64, move it into the function setting basic caps for the emulator. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Neal Gompa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_capabilities.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fd3a032ded..a355018c03 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5063,6 +5063,9 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) case VIR_ARCH_AARCH64: /* ACPI only works on x86 and aarch64 */ 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; case VIR_ARCH_PPC64: @@ -5126,11 +5129,6 @@ virQEMUCapsInitQMPVersionCaps(virQEMUCaps *qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS); 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)) { /* HPT resizing is supported since QEMU 2.10 on ppc64; unfortunately * there's no sane way to probe for it */