fixed kqemu config

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1289 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/configure b/configure
index 21ea62a52d75d48cea04bf031e0192117ba0b992..cc21847c8f90d2587748d7c2da9f6b7d6b4eb2ef 100755 (executable)
--- a/configure
+++ b/configure
@@ -195,6 +195,7 @@ if test "$mingw32" = "yes" ; then
     EXESUF=".exe"
     gdbstub="no"
     oss="no"
+    kqemu="no"
 fi
 
 if test -z "$target_list" ; then
@@ -609,6 +610,9 @@ if test "$target_cpu" = "i386" ; then
   echo "TARGET_ARCH=i386" >> $config_mak
   echo "#define TARGET_ARCH \"i386\"" >> $config_h
   echo "#define TARGET_I386 1" >> $config_h
+  if test $kqemu = "yes" -a "$target_softmmu" = "yes" ; then
+    echo "#define USE_KQEMU 1" >> $config_h
+  fi
 elif test "$target_cpu" = "arm" -o "$target_cpu" = "armeb" ; then
   echo "TARGET_ARCH=arm" >> $config_mak
   echo "#define TARGET_ARCH \"arm\"" >> $config_h

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 38f9595af9bb5ac378cddbb75b79931343d83eb2..154d8bfdae13f889e30d10b5b7e93b8bfe196878 100644 (file)
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -39,9 +39,6 @@
 #if defined(__i386__) && !defined(CONFIG_SOFTMMU)
 #define USE_CODE_COPY
 #endif
-#if defined(CONFIG_KQEMU) && defined(__linux__) && defined(CONFIG_SOFTMMU) && defined(__i386__) && !defined(TARGET_X86_64)
-#define USE_KQEMU
-#endif
 
 #define R_EAX 0
 #define R_ECX 1