From 113d73aa59cc84f219b08ed968bb62089fb10b8e Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 14 Apr 2016 12:48:59 +0200 Subject: [PATCH] config: x86: stop pretending to be an Lguest guest Ever since v2.6.36 there's a conflict between OLPC support and Lguest guest support: a kernel image can't both support booting OLPC x86 hardware and booting as an Lguest guest. Booting a kernel image that tries to do both as an Lguest guest will fail with lguest: Reinjecting trap 13 for fault at 0x1000062: Invalid argument This means that people wanting to boot an Lguest guest on 32 bits x86 needed to build their own kernel image without OLPC support since, it seems, Fedora 15. So let's stop pretending to support being an Lguest guest. People wanting to have that will now not only have to disable CONFIG_OLPC but also enable CONFIG_LGUEST_GUEST. (A second order effect is that both CONFIG_VIRTIO and CONFIG_VIRTIO_CONSOLE will change from 'y' to 'm' in our builds. Assuming a sane build system no one should notice. We'll see.) Signed-off-by: Paul Bolle --- config-x86-generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config-x86-generic b/config-x86-generic index 06ddcd1a0..83d3fd57b 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -279,7 +279,7 @@ CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m CONFIG_KVM_DEVICE_ASSIGNMENT=y CONFIG_LGUEST=m -CONFIG_LGUEST_GUEST=y +# CONFIG_LGUEST_GUEST is not set CONFIG_HYPERVISOR_GUEST=y CONFIG_PARAVIRT=y