From: Avi Kivity <[email protected]> We use USE_KVM instead of CONFIG_KVM to distinguish between our version of the kvm/qemu glue and the official one. Change ./configure to reflect that.
Signed-off-by: Avi Kivity <[email protected]> diff --git a/configure b/configure index d31ca0d..f526bd5 100755 --- a/configure +++ b/configure @@ -1716,9 +1716,9 @@ case "$target_cpu" in echo "#define USE_KQEMU 1" >> $config_h fi if test "$kvm" = "yes" ; then - echo "CONFIG_KVM=yes" >> $config_mak + echo "USE_KVM=yes" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak - echo "#define CONFIG_KVM 1" >> $config_h + echo "#define USE_KVM 1" >> $config_h fi configure_kvm ;; @@ -1740,9 +1740,9 @@ case "$target_cpu" in configure_kvm if [ use_upstream_kvm = yes ]; then if test "$kvm" = "yes" ; then - echo "CONFIG_KVM=yes" >> $config_mak + echo "USE_KVM=yes" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak - echo "#define CONFIG_KVM 1" >> $config_h + echo "#define USE_KVM 1" >> $config_h fi fi ;; @@ -1804,9 +1804,9 @@ case "$target_cpu" in echo "#define TARGET_PPC 1" >> $config_h echo "#define TARGET_PPCEMB 1" >> $config_h if test "$kvm" = "yes" ; then - echo "CONFIG_KVM=yes" >> $config_mak + echo "USE_KVM=yes" >> $config_mak echo "KVM_CFLAGS=$kvm_cflags" >> $config_mak - echo "#define CONFIG_KVM 1" >> $config_h + echo "#define USE_KVM 1" >> $config_h fi gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" ;; -- 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
