From: aliguori Date: Fri, 9 Jan 2009 20:05:10 +0000 (+0000) Subject: fix configuring kvm probe when using --kerneldir (Christian Ehrhardt) X-Git-Tag: stefano.display-merge-end~178 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8444eb6ecd90c4e1b8497fb9c2f41c598c897275;p=qemu-xen-4.3-testing.git 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 Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6263 c046a42c-6fe2-441c-8c8c-71466251a162 --- diff --git a/configure b/configure index adfdb47c6..a8ea55a6e 100755 --- a/configure +++ b/configure @@ -964,6 +964,12 @@ int main(void) { return 0; } 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