[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/26] configure kvm in a single place
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 12/26] configure kvm in a single place |
Date: |
Mon, 13 Jul 2009 17:53:51 +0200 |
From: Juan Quintela <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
configure | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/configure b/configure
index ea17fb7..864cf77 100755
--- a/configure
+++ b/configure
@@ -1958,19 +1958,6 @@ target_nptl="no"
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_arch2/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_arch2" = "$cpu" -o \
- \( "$target_arch2" = "ppcemb" -a "$cpu" = "ppc" \) -o \
- \( "$target_arch2" = "x86_64" -a "$cpu" = "i386" \) -o \
- \( "$target_arch2" = "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_arch2" in
i386)
@@ -1982,11 +1969,6 @@ case "$target_arch2" 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)
@@ -2000,11 +1982,6 @@ case "$target_arch2" 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)
@@ -2088,11 +2065,6 @@ case "$target_arch2" 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
;;
@@ -2168,6 +2140,18 @@ case "$target_arch2" in
echo "#define CONFIG_XEN 1" >> $config_h
fi
esac
+case "$target_arch2" in
+ i386|x86_64|ppcemb)
+ # Make sure the target and host cpus are compatible
+ if test ! \( "$target_arch2" = "$cpu" -o \
+ \( "$target_arch2" = "ppcemb" -a "$cpu" = "ppc" \) -o \
+ \( "$target_arch2" = "x86_64" -a "$cpu" = "i386" \) -o \
+ \( "$target_arch2" = "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.5
- [Qemu-devel] [PATCH 07/26] already defined several lines before in block-obj-y, (continued)
- [Qemu-devel] [PATCH 07/26] already defined several lines before in block-obj-y, quintela, 2009/07/13
- [Qemu-devel] [PATCH 08/26] configure already knows what TARGET_BASE_ARCH we need, no need to put the logic in Makefile.target, quintela, 2009/07/13
- [Qemu-devel] [PATCH 06/26] Remove unused Makefile variable, quintela, 2009/07/13
- [Qemu-devel] [PATCH 05/26] use nwfpe-obj-y for consistence, quintela, 2009/07/13
- [Qemu-devel] [PATCH 10/26] change ifdefs by obj-$(TARGET_BASE_ARCH), quintela, 2009/07/13
- [Qemu-devel] [PATCH 13/26] configure kqemu in a single place, quintela, 2009/07/13
- [Qemu-devel] [PATCH 09/26] TARGET_ARCH2 is already known at configure time., quintela, 2009/07/13
- [Qemu-devel] [PATCH 11/26] configure xen in a single place, quintela, 2009/07/13
- [Qemu-devel] [PATCH 14/26] BASE_LDFLAGS is not used anywhere else, quintela, 2009/07/13
- [Qemu-devel] [PATCH 15/26] TARGET_ARCH == TARGET_BASE_ARCH in m68k and arm, quintela, 2009/07/13
- [Qemu-devel] [PATCH 12/26] configure kvm in a single place,
quintela <=
- [Qemu-devel] [PATCH 16/26] Refactor a single rule to generate all qemu-* executables, quintela, 2009/07/13
- [Qemu-devel] [PATCH 17/26] qemu binary don't exist anymore. I guess not much people is compiling on alpha, quintela, 2009/07/13
- [Qemu-devel] [PATCH 18/26] We can wrap OS_CFLAGS/OS_LDFLAGS in CFLAGS/LDFLAGS at configure time, quintela, 2009/07/13
- [Qemu-devel] [PATCH 19/26] We can wrap ARCH_CFLAGS/ARCH_LDFLAGS in CFLAGS/LDFLAGS at configure time, quintela, 2009/07/13
- [Qemu-devel] [PATCH 20/26] generate ARCH name instead of coding it, quintela, 2009/07/13
- [Qemu-devel] [PATCH 21/26] Refactor common code using a list, quintela, 2009/07/13
- [Qemu-devel] [PATCH 22/26] Refactor targe_bigendian selection in another list, quintela, 2009/07/13
- [Qemu-devel] [PATCH 23/26] print only once TARGET_ARCH, quintela, 2009/07/13
- [Qemu-devel] [PATCH 25/26] generate TARGET_ARCH for config.h, quintela, 2009/07/13
- [Qemu-devel] [PATCH 24/26] Only setup TARGET_ARCH when it is different of, quintela, 2009/07/13