[Qemu-devel] [5631] Allow KVM to be used on either 32-bit or 64-bit x86

[Anthony Liguori]

Revision: 5631
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5631
Author:   aliguori
Date:     2008-11-05 19:59:25 +0000 (Wed, 05 Nov 2008)

Log Message:
-----------
Allow KVM to be used on either 32-bit or 64-bit x86

Inspired by a patch from Glauber Costa.

Signed-off-by: Anthony Liguori <address@hidden>

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

Modified: trunk/configure
===================================================================
--- trunk/configure     2008-11-05 19:25:39 UTC (rev 5630)
+++ trunk/configure     2008-11-05 19:59:25 UTC (rev 5631)
@@ -1447,8 +1447,10 @@
 echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
 gdb_xml_files=""
 
-# FIXME allow i386 to build on x86_64 and vice versa
-if test "$kvm" = "yes" -a "$target_cpu" != "$cpu" ; then
+# Make sure the target and host cpus are compatible
+if test "$kvm" = "yes" -a ! \( "$target_cpu" = "$cpu" -o \
+  \( "$target_cpu" = "x86_64" -a "$cpu" = "i386"   \) -o \
+  \( "$target_cpu" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
   kvm="no"
 fi
 # Disable KVM for linux-user
@@ -1468,7 +1470,7 @@
     if test "$kvm" = "yes" ; then
       echo "CONFIG_KVM=yes" >> $config_mak
       echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
-      echo "#define CONFIG_KVM" >> $config_h
+      echo "#define CONFIG_KVM 1" >> $config_h
     fi
     gcc3minver=`$cc --version 2> /dev/null| fgrep "(GCC) 3." | awk '{ print $3 
}' | cut -f2 -d.`
     if test -n "$gcc3minver" && test $gcc3minver -gt 3