Revision 4ca1a9c6 configure

b/configure
1862 1862
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
1863 1863
echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
1864 1864
gdb_xml_files=""
1865
target_kvm="$kvm"
1865 1866

  
1866 1867
# Make sure the target and host cpus are compatible
1867
if test "$kvm" = "yes" -a ! \( "$target_cpu" = "$cpu" -o \
1868
if test ! \( "$target_cpu" = "$cpu" -o \
1868 1869
  \( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \
1869 1870
  \( "$target_cpu" = "x86_64" -a "$cpu" = "i386"   \) -o \
1870 1871
  \( "$target_cpu" = "i386"   -a "$cpu" = "x86_64" \) \) ; then
1871
  kvm="no"
1872
  target_kvm="no"
1872 1873
fi
1873 1874
# Disable KVM for linux-user
1874
if test "$kvm" = "yes" -a "$target_softmmu" = "no" ; then
1875
  kvm="no"
1875
if test "$target_softmmu" = "no" ; then
1876
  target_kvm="no"
1876 1877
fi
1877 1878

  
1878 1879
case "$target_cpu" in
......
1885 1886
      echo "CONFIG_KQEMU=yes" >> $config_mak
1886 1887
      echo "#define CONFIG_KQEMU 1" >> $config_h
1887 1888
    fi
1888
    if test "$kvm" = "yes" ; then
1889
    if test "$target_kvm" = "yes" ; then
1889 1890
      echo "CONFIG_KVM=yes" >> $config_mak
1890 1891
      echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
1891 1892
      echo "#define CONFIG_KVM 1" >> $config_h
......
1907 1908
      echo "CONFIG_KQEMU=yes" >> $config_mak
1908 1909
      echo "#define CONFIG_KQEMU 1" >> $config_h
1909 1910
    fi
1910
    if test "$kvm" = "yes" ; then
1911
    if test "$target_kvm" = "yes" ; then
1911 1912
      echo "CONFIG_KVM=yes" >> $config_mak
1912 1913
      echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
1913 1914
      echo "#define CONFIG_KVM 1" >> $config_h
......
1992 1993
    echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
1993 1994
    echo "#define TARGET_PPC 1" >> $config_h
1994 1995
    echo "#define TARGET_PPCEMB 1" >> $config_h
1995
    if test "$kvm" = "yes" ; then
1996
    if test "$target_kvm" = "yes" ; then
1996 1997
      echo "CONFIG_KVM=yes" >> $config_mak
1997 1998
      echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
1998 1999
      echo "#define CONFIG_KVM 1" >> $config_h

Also available in: Unified diff