| Message ID | 1562865736-3546-3-git-send-email-pbonzini@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | small create_config cleanup | expand |
On 7/11/19 7:22 PM, Paolo Bonzini wrote: > 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> > --- > configure | 2 +- > scripts/create_config | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 4983c8b..eb635c3 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 00e86c8..6d8f08b 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" > ;; > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
lgtm, thanks Paolo Reviewed-by: Julio Montes <julio.montes@intel.com> Tested-by: Julio Montes <julio.montes@intel.com> On Thu, 2019-07-11 at 19:22 +0200, Paolo Bonzini wrote: > 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> > --- > configure | 2 +- > scripts/create_config | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 4983c8b..eb635c3 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 00e86c8..6d8f08b 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" > ;;
diff --git a/configure b/configure index 4983c8b..eb635c3 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 00e86c8..6d8f08b 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" ;;
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> --- configure | 2 +- scripts/create_config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)