[Qemu-devel] [6263] fix configuring kvm probe when using --kerneldir (Christian Ehrhardt )

[Anthony Liguori <anthony@codemonkey.ws>]

Revision: 6263
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6263
Author:   aliguori
Date:     2009-01-09 20:05:10 +0000 (Fri, 09 Jan 2009)

Log Message:
-----------
fix configuring kvm probe when using --kerneldir (Christian Ehrhardt)

There is already a variable kvm_cflags which gets the path of the kernel
includes when using --kerneldir. But eventually with newer kernels we all will
need arch/$arch/include too (my case was a incldue of asm/kvm.h which was not
found anymore). Headers in a full kernel source are not flattened to
one arch like they are if e.g. installed kernel headers are used.

To fix that, the includes added to cflags depending on --kerneldir should also
contian the arch includes. The patch adds a special check for x86 because its
source layout recently changed, all others directly use arch/$cpu/include if
existent.

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Modified Paths:
--------------
    trunk/configure

Modified: trunk/configure
===================================================================
--- trunk/configure	2009-01-09 19:51:09 UTC (rev 6262)
+++ trunk/configure	2009-01-09 20:05:10 UTC (rev 6263)
@@ -964,6 +964,12 @@
 EOF
   if test "$kerneldir" != "" ; then
       kvm_cflags=-I"$kerneldir"/include
+      if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) \
+         -a -d "$kerneldir/arch/x86/include" ; then
+            kvm_cflags="$kvm_cflags -I$kerneldir/arch/x86/include"
+        elif test -d "$kerneldir/arch/$cpu/include" ; then
+            kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include"
+      fi
   else
       kvm_cflags=""
   fi