On Wed, Mar 29, 2017 at 04:08:54PM +0200, Andrea Bolognani wrote:
So far, libvirt has assumed that only x86 supports ACPI, but that's inaccurate since aarch64 supports it too. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1429509 --- src/qemu/qemu_capabilities.c | 28 ++++++++++++++++------ .../caps_2.6.0-gicv2.aarch64.xml | 1 + .../caps_2.6.0-gicv3.aarch64.xml | 1 + .../qemuxml2argv-aarch64-gic-host.args | 1 + .../qemuxml2argv-aarch64-gic-v2.args | 1 + .../qemuxml2argv-aarch64-gic-v3.args | 1 + 6 files changed, 26 insertions(+), 7 deletions(-)
@@ -4096,10 +4100,15 @@ virQEMUCapsInitHelp(virQEMUCapsPtr qemuCaps, uid_t runUid, gid_t runGid, const c qmperr) < 0) goto cleanup; - /* -no-acpi is not supported on non-x86 - * even if qemu reports it in -help */ - if (!ARCH_IS_X86(qemuCaps->arch)) + /* Older QEMU versions reported -no-acpi in the output of -help even + * though it was not supported by the architecture. The issue has since + * been fixed, but to maintain compatibility with all release we still + * need to filter out the capability for architectures that we know + * don't support the feature, eg. anything but x86 and aarch64 */ + if (!ARCH_IS_X86(qemuCaps->arch) && + qemuCaps->arch != VIR_ARCH_AARCH64) { virQEMUCapsClear(qemuCaps, QEMU_CAPS_NO_ACPI); + }
This adjustment is dead code. aarch64 was introduced in QEMU 1.6.0, but we stopped parsing help since QEMU 1.2.0. Jan
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list