From: Viktor Mihajlovski Date: Fri, 22 Jun 2012 11:50:10 +0000 (+0200) Subject: S390: Override QEMU_CAPS_NO_ACPI for s390x X-Git-Tag: v0.9.13-rc2~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a6c347118f0310157277d90c556cdd41b7e922c;p=thirdparty%2Flibvirt.git S390: Override QEMU_CAPS_NO_ACPI for s390x Starting a KVM guest on s390 fails immediately. This is because "qemu --help" reports -no-acpi even for the s390(x) architecture but -no-acpi isn't supported there. Workaround is to remove QEMU_CAPS_NO_ACPI from the capability set after the version/capability extraction. Signed-off-by: Viktor Mihajlovski --- diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 578daebdb4..1e12a3995c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1514,6 +1514,11 @@ int qemuCapsExtractVersionInfo(const char *qemu, const char *arch, qemuCapsSet(flags, QEMU_CAPS_PCI_MULTIBUS); } + /* S390 and probably other archs do not support no-acpi - + maybe the qemu option parsing should be re-thought. */ + if (STRPREFIX(arch, "s390")) + qemuCapsClear(flags, QEMU_CAPS_NO_ACPI); + /* qemuCapsExtractDeviceStr will only set additional flags if qemu * understands the 0.13.0+ notion of "-device driver,". */ if (qemuCapsGet(flags, QEMU_CAPS_DEVICE) &&