From: Juan Quintela <[email protected]>
Signed-off-by: Juan Quintela <[email protected]>
Signed-off-by: Marcelo Tosatti <[email protected]>
diff --git a/configure b/configure
index 7e51644..911cac6 100755
--- a/configure
+++ b/configure
@@ -2052,6 +2052,9 @@ fi
if test "$need_offsetof" = "yes" ; then
echo "CONFIG_NEED_OFFSETOF=y" >> $config_host_mak
fi
+if test $cpu_emulation = "no"; then
+ echo "NO_CPU_EMULATION=1" >> $config_host_mak
+fi
# XXX: suppress that
if [ "$bsd" = "yes" ] ; then
@@ -2224,28 +2227,6 @@ interp_prefix1=`echo "$interp_prefix" | sed
"s/%M/$target_arch2/g"`
echo "CONFIG_QEMU_PREFIX=\"$interp_prefix1\"" >> $config_mak
gdb_xml_files=""
-disable_cpu_emulation() {
- if test $cpu_emulation = "no"; then
- echo "#define NO_CPU_EMULATION 1" >> $config_host_h
- echo "NO_CPU_EMULATION=1" >> $config_host_mak
- fi
-}
-
-configure_kvm() {
- if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \
- \( "$cpu" = "i386" -o "$cpu" = "x86_64" -o "$cpu" = "ia64" -o "$cpu"
= "powerpc" \); then
- echo "CONFIG_KVM=y" >> $config_mak
- echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
- if test $kvm_cap_pit = "yes" ; then
- echo "USE_KVM_PIT=1" >> $config_mak
- fi
- if test $kvm_cap_device_assignment = "yes" ; then
- echo "USE_KVM_DEVICE_ASSIGNMENT=1" >> $config_mak
- fi
- disable_cpu_emulation
- fi
-}
-
TARGET_ARCH="$target_arch2"
TARGET_BASE_ARCH=""
TARGET_ABI_DIR=""
@@ -2388,7 +2369,12 @@ case "$target_arch2" in
\( "$target_arch2" = "i386" -a "$cpu" = "x86_64" \) \) ; then
echo "CONFIG_KVM=y" >> $config_mak
echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
- configure_kvm
+ if test $kvm_cap_pit = "yes" ; then
+ echo "USE_KVM_PIT=1" >> $config_mak
+ fi
+ if test $kvm_cap_device_assignment = "yes" ; then
+ echo "USE_KVM_DEVICE_ASSIGNMENT=1" >> $config_mak
+ fi
fi
esac
echo "TARGET_PHYS_ADDR_BITS=$target_phys_bits" >> $config_mak
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
