diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-06-07 13:29:26 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-06-07 13:29:26 +0000 |
| commit | 4ca1a9c62af1b98a359254546cd8e9999c892670 (patch) | |
| tree | adf72b9e96c6682687ded511aa99a209d69ca144 | |
| parent | 153859be1a0928d07ec2dc2b18847e32e180ff43 (diff) | |
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>
| -rwxr-xr-x | configure | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -1862,17 +1862,18 @@ 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 "$kvm" = "yes" -a ! \( "$target_cpu" = "$cpu" -o \ +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 - kvm="no" + target_kvm="no" fi # Disable KVM for linux-user -if test "$kvm" = "yes" -a "$target_softmmu" = "no" ; then - kvm="no" +if test "$target_softmmu" = "no" ; then + target_kvm="no" fi case "$target_cpu" in @@ -1885,7 +1886,7 @@ case "$target_cpu" in echo "CONFIG_KQEMU=yes" >> $config_mak echo "#define CONFIG_KQEMU 1" >> $config_h fi - if test "$kvm" = "yes" ; then + if test "$target_kvm" = "yes" ; then echo "CONFIG_KVM=yes" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "#define CONFIG_KVM 1" >> $config_h @@ -1907,7 +1908,7 @@ case "$target_cpu" in echo "CONFIG_KQEMU=yes" >> $config_mak echo "#define CONFIG_KQEMU 1" >> $config_h fi - if test "$kvm" = "yes" ; then + if test "$target_kvm" = "yes" ; then echo "CONFIG_KVM=yes" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak 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_PPC 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 "KVM_CFLAGS=$kvm_cflags" >> $config_mak echo "#define CONFIG_KVM 1" >> $config_h |