Commit 8444eb6ecd90c4e1b8497fb9c2f41c598c897275
1 parent
9ec0b4a3
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> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6263 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
6 additions
and
0 deletions
configure
| @@ -964,6 +964,12 @@ int main(void) { return 0; } | @@ -964,6 +964,12 @@ int main(void) { return 0; } | ||
| 964 | EOF | 964 | EOF |
| 965 | if test "$kerneldir" != "" ; then | 965 | if test "$kerneldir" != "" ; then |
| 966 | kvm_cflags=-I"$kerneldir"/include | 966 | kvm_cflags=-I"$kerneldir"/include |
| 967 | + if test \( "$cpu" = "i386" -o "$cpu" = "x86_64" \) \ | ||
| 968 | + -a -d "$kerneldir/arch/x86/include" ; then | ||
| 969 | + kvm_cflags="$kvm_cflags -I$kerneldir/arch/x86/include" | ||
| 970 | + elif test -d "$kerneldir/arch/$cpu/include" ; then | ||
| 971 | + kvm_cflags="$kvm_cflags -I$kerneldir/arch/$cpu/include" | ||
| 972 | + fi | ||
| 967 | else | 973 | else |
| 968 | kvm_cflags="" | 974 | kvm_cflags="" |
| 969 | fi | 975 | fi |