From: Paolo Bonzini <pbonzini@redhat.com>
Date: Thu, 11 Jul 2019 17:08:36 +0000 (+0200)
Subject: create_config: remove $(CONFIG_SOFTMMU) hack
X-Git-Tag: v4.1.0-rc1~3^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cae16db021601b5437622f89a86d5c489799fb3;p=thirdparty%2Fqemu.git

create_config: remove $(CONFIG_SOFTMMU) hack

CONFIG_TPM is defined to a rather weird $(CONFIG_SOFTMMU) so that it
expands to the right thing in hw/Makefile.objs.  This however is not
needed anymore and it has a corresponding hack in create_config
to turn it into "#define CONFIG_TPM 1".  Clean up.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/configure b/configure
index 4983c8b5330..eb635c3b9a5 100755
--- a/configure
+++ b/configure
@@ -7159,7 +7159,7 @@ if test "$live_block_migration" = "yes" ; then
 fi
 
 if test "$tpm" = "yes"; then
-  echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak
+  echo 'CONFIG_TPM=y' >> $config_host_mak
 fi
 
 echo "TRACE_BACKENDS=$trace_backends" >> $config_host_mak
diff --git a/scripts/create_config b/scripts/create_config
index 00e86c82b07..6d8f08b39da 100755
--- a/scripts/create_config
+++ b/scripts/create_config
@@ -54,7 +54,7 @@ case $line in
     done
     echo "    NULL"
     ;;
- CONFIG_*='$(CONFIG_SOFTMMU)'|CONFIG_*=y) # configuration
+ CONFIG_*=y) # configuration
     name=${line%=*}
     echo "#define $name 1"
     ;;