[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/13] configure kvm in a single place
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 12/13] configure kvm in a single place |
Date: |
Wed, 1 Jul 2009 18:58:38 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 41 +++++++++++++----------------------------
1 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/configure b/configure
index 56e4d38..1fe01af 100755
--- a/configure
+++ b/configure
@@ -1962,19 +1962,6 @@ target_nptl="no"
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
gdb_xml_files=""
-target_kvm="$kvm"
-
-# Make sure the target and host cpus are compatible
-if test ! \( "$target_cpu" = "$cpu" -o \
- \( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \
- \( "$target_cpu" = "x86_64" -a "$cpu" = "i386" \) -o \
- \( "$target_cpu" = "i386" -a "$cpu" = "x86_64" \) \) ; then
- target_kvm="no"
-fi
-# Disable KVM for linux-user
-if test "$target_softmmu" = "no" ; then
- target_kvm="no"
-fi
case "$target_cpu" in
i386)
@@ -1986,11 +1973,6 @@ case "$target_cpu" in
echo "CONFIG_KQEMU=y" >> $config_mak
echo "#define CONFIG_KQEMU 1" >> $config_h
fi
- if test "$target_kvm" = "yes" ; then
- echo "CONFIG_KVM=y" >> $config_mak
- echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
- echo "#define CONFIG_KVM 1" >> $config_h
- fi
target_phys_bits=32
;;
x86_64)
@@ -2004,11 +1986,6 @@ case "$target_cpu" in
echo "CONFIG_KQEMU=y" >> $config_mak
echo "#define CONFIG_KQEMU 1" >> $config_h
fi
- if test "$target_kvm" = "yes" ; then
- echo "CONFIG_KVM=y" >> $config_mak
- echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
- echo "#define CONFIG_KVM 1" >> $config_h
- fi
target_phys_bits=64
;;
alpha)
@@ -2091,11 +2068,6 @@ case "$target_cpu" in
echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
echo "#define TARGET_PPC 1" >> $config_h
echo "#define TARGET_PPCEMB 1" >> $config_h
- if test "$target_kvm" = "yes" ; then
- echo "CONFIG_KVM=y" >> $config_mak
- echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
- echo "#define CONFIG_KVM 1" >> $config_h
- fi
gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml
power-spe.xml"
target_phys_bits=64
;;
@@ -2171,6 +2143,19 @@ case "$target_cpu" in
echo "#define CONFIG_XEN 1" >> $config_h
fi
esac
+case "$target_cpu" in
+ i386|x86_64|ppcemb)
+ # Make sure the target and host cpus are compatible
+ if test "$kvm" = "yes" -a "$target_softmmu" = "yes" -a \
+ \( "$target_cpu" = "$cpu" -o \
+ \( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \
+ \( "$target_cpu" = "x86_64" -a "$cpu" = "i386" \) -o \
+ \( "$target_cpu" = "i386" -a "$cpu" = "x86_64" \) \) ; then
+ echo "CONFIG_KVM=y" >> $config_mak
+ echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
+ echo "#define CONFIG_KVM 1" >> $config_h
+ fi
+esac
echo "HWLIB=../libhw$target_phys_bits/libqemuhw$target_phys_bits.a" >>
$config_mak
echo "#define TARGET_PHYS_ADDR_BITS $target_phys_bits" >> $config_h
echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
--
1.6.2.2
- [Qemu-devel] [PATCH 06/13] Remove unused Makefile variable, (continued)
- [Qemu-devel] [PATCH 06/13] Remove unused Makefile variable, quintela, 2009/07/01
- [Qemu-devel] [PATCH 05/13] use nwfpe-obj-y for consistence, quintela, 2009/07/01
- [Qemu-devel] [PATCH 07/13] already defined several lines before in block-obj-y, quintela, 2009/07/01
- [Qemu-devel] [PATCH 08/13] configure already knows what TARGET_BASE_ARCH we need, no need to put the logic in Makefile.target, quintela, 2009/07/01
- [Qemu-devel] [PATCH 10/13] chang ifdefs by obj-, quintela, 2009/07/01
- [Qemu-devel] [PATCH 09/13] TARGET_ARCH2 is already known at configure time and it is called target_cpu Remove re-construction in Makefile.target, quintela, 2009/07/01
- [Qemu-devel] [PATCH 11/13] configure xen in a single place, quintela, 2009/07/01
- [Qemu-devel] [PATCH 12/13] configure kvm in a single place,
quintela <=
- [Qemu-devel] [PATCH 13/13] configure kqemu in a single place, quintela, 2009/07/01