On Wed, 2017-04-05 at 12:00 +0200, Ján Tomko wrote: [...] > > @@ -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. As mentioned in response to John's review of v1, I changed this so that there are no inconsistencies between the QMP and non-QMP codepaths that could confuse people as to which behavior is the correct one down the line, but if you want me to get rid of it I can revert the code change and settle with fleshing out the comment further. -- Andrea Bolognani / Red Hat / Virtualization -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list