From 2a6cfe8ee8268406f7d64be346dfe207fcd2c969 Mon Sep 17 00:00:00 2001 From: Viktor Mihajlovski Date: Fri, 22 Jun 2012 13:50:10 +0200 Subject: [PATCH] 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 (cherry picked from commit 6a6c347118f0310157277d90c556cdd41b7e922c) (crobinso: add Viktor to AUTHORS) --- AUTHORS | 1 + src/qemu/qemu_capabilities.c | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/AUTHORS b/AUTHORS index 9efac2e29f..5a4e4955da 100644 --- a/AUTHORS +++ b/AUTHORS @@ -237,6 +237,7 @@ Patches have also been contributed by: Beat Jörg Gao feng Dipankar Sarma + Viktor Mihajlovski [....send patches to get your name here....] diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 95d6823b57..ae26967083 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1496,6 +1496,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) &&