Re: [kvm-devel] build #365 issue for v2.6.25-rc2-342-g5d9c4a7 in./arch/x86/kvm/kvm.ko

[Avi Kivity]

Avi Kivity wrote:
> Toralf Förster wrote:
> > Hello,
> >
> > the build with the attached .config failed, make ends with:
> > ...
> >   HOSTCC  arch/x86/boot/tools/build
> >   BUILD   arch/x86/boot/bzImage
> > Root device is (3, 8)
> > Setup is 12280 bytes (padded to 12288 bytes).
> > System is 2192 kB
> > Kernel: arch/x86/boot/bzImage is ready  (#1)
> >   Building modules, stage 2.
> >   MODPOST 211 modules
> > ERROR: "smp_ops" [arch/x86/kvm/kvm.ko] undefined!
> > make[1]: *** [__modpost] Error 1
> > make: *** [modules] Error 2
> >
> >
> > The build was made with :
> > $> make mrproper && make rndconfig && <tweak config file> && make 
> > oldconfig && make
> >
> > Here's the config:
> >   
>
> Looks like KVM conflicts with CONFIG_VOYAGER...

Attached patch should fix.

Subject: x86: disable KVM on Voyager

Most classic Pentiums don't have hardware virtualization
extension, and building kvm with voyager generates
spurious failures.

Signed-off-by: Avi Kivity <avi@xxxxxxxxxxxx>

--
Any sufficiently difficult bug is indistinguishable from a feature.

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cc2bc37..e27962c 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -21,7 +21,7 @@ config X86
 	select HAVE_IDE
 	select HAVE_OPROFILE
 	select HAVE_KPROBES
-	select HAVE_KVM
+	select HAVE_KVM if ((X86_32 && !X86_VOYAGER) || X86_64)
 
 
 config GENERIC_LOCKBREAK