]> git.proxmox.com Git - qemu.git/commitdiff
kvm: Detect availability of kvm_para.h
authorJan Kiszka <jan.kiszka@siemens.com>
Tue, 12 Jan 2010 18:53:48 +0000 (19:53 +0100)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 12 Jan 2010 20:32:19 +0000 (14:32 -0600)
Will be required for upcoming KVM cpuid leaf. Host kernels >= 2.6.32 as
well as future kvm-kmod releases (more recent than kvm-kmod-2.6.32.3)
do/will provide them.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
configure

index 623c30e219c2cf79867c22bbef6e5eca794b8788..1ddb3a119ab4cd87d8e47462fd6af5f7d412319b 100755 (executable)
--- a/configure
+++ b/configure
@@ -216,6 +216,7 @@ curses=""
 docs=""
 fdt=""
 kvm=""
+kvm_para=""
 nptl=""
 sdl=""
 sparse="no"
@@ -1388,6 +1389,13 @@ EOF
   fi
   if compile_prog "$kvm_cflags" "" ; then
     kvm=yes
+    cat > $TMPC <<EOF
+#include <linux/kvm_para.h>
+int main(void) { return 0; }
+EOF
+    if compile_prog "$kvm_cflags" "" ; then
+      kvm_para=yes
+    fi
   else
     if test "$kvm" = "yes" ; then
       if [ -x "`which awk 2>/dev/null`" ] && \
@@ -2384,6 +2392,9 @@ case "$target_arch2" in
       \( "$target_arch2" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
       echo "CONFIG_KVM=y" >> $config_target_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_target_mak
+      if test "$kvm_para" = "yes"; then
+        echo "CONFIG_KVM_PARA=y" >> $config_target_mak
+      fi
     fi
 esac
 echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_target_mak