ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix generation of CONFIG_KVM 

When configuring for several targets, some with KVM and some without, CONFIG_KVM was accidentally disabled for some of the targets.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Blue Swirl 2009-06-07 13:29:26 +00:00
parent 153859be1a
commit 4ca1a9c62a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -1862,17 +1862,18 @@ target_nptl="no"
interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"` interp_prefix1=`echo "$interp_prefix" | sed "s/%M/$target_cpu/g"`
echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h echo "#define CONFIG_QEMU_PREFIX \"$interp_prefix1\"" >> $config_h
gdb_xml_files="" gdb_xml_files=""
target_kvm="$kvm"
# Make sure the target and host cpus are compatible # Make sure the target and host cpus are compatible
if test "$kvm" = "yes" -a ! \( "$target_cpu" = "$cpu" -o \ if test ! \( "$target_cpu" = "$cpu" -o \
\( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \ \( "$target_cpu" = "ppcemb" -a "$cpu" = "ppc" \) -o \
\( "$target_cpu" = "x86_64" -a "$cpu" = "i386" \) -o \ \( "$target_cpu" = "x86_64" -a "$cpu" = "i386" \) -o \
\( "$target_cpu" = "i386" -a "$cpu" = "x86_64" \) \) ; then \( "$target_cpu" = "i386" -a "$cpu" = "x86_64" \) \) ; then
kvm="no" target_kvm="no"
fi fi
# Disable KVM for linux-user # Disable KVM for linux-user
if test "$kvm" = "yes" -a "$target_softmmu" = "no" ; then if test "$target_softmmu" = "no" ; then
kvm="no" target_kvm="no"
fi fi
case "$target_cpu" in case "$target_cpu" in
@ -1885,7 +1886,7 @@ case "$target_cpu" in
echo "CONFIG_KQEMU=yes" >> $config_mak echo "CONFIG_KQEMU=yes" >> $config_mak
echo "#define CONFIG_KQEMU 1" >> $config_h echo "#define CONFIG_KQEMU 1" >> $config_h
fi fi
if test "$kvm" = "yes" ; then if test "$target_kvm" = "yes" ; then
echo "CONFIG_KVM=yes" >> $config_mak echo "CONFIG_KVM=yes" >> $config_mak
echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
echo "#define CONFIG_KVM 1" >> $config_h echo "#define CONFIG_KVM 1" >> $config_h
@ -1907,7 +1908,7 @@ case "$target_cpu" in
echo "CONFIG_KQEMU=yes" >> $config_mak echo "CONFIG_KQEMU=yes" >> $config_mak
echo "#define CONFIG_KQEMU 1" >> $config_h echo "#define CONFIG_KQEMU 1" >> $config_h
fi fi
if test "$kvm" = "yes" ; then if test "$target_kvm" = "yes" ; then
echo "CONFIG_KVM=yes" >> $config_mak echo "CONFIG_KVM=yes" >> $config_mak
echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
echo "#define CONFIG_KVM 1" >> $config_h echo "#define CONFIG_KVM 1" >> $config_h
@ -1992,7 +1993,7 @@ case "$target_cpu" in
echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h echo "#define TARGET_ARCH \"ppcemb\"" >> $config_h
echo "#define TARGET_PPC 1" >> $config_h echo "#define TARGET_PPC 1" >> $config_h
echo "#define TARGET_PPCEMB 1" >> $config_h echo "#define TARGET_PPCEMB 1" >> $config_h
if test "$kvm" = "yes" ; then if test "$target_kvm" = "yes" ; then
echo "CONFIG_KVM=yes" >> $config_mak echo "CONFIG_KVM=yes" >> $config_mak
echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak
echo "#define CONFIG_KVM 1" >> $config_h echo "#define CONFIG_KVM 1" >> $config_h