Skip to contentSkip to conversation

configure: add missing CONFIG_FOO variables

PATCH In review Stefan Hajnoczi 2 participants 6 messages Sep 14, 2020 – Sep 15, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover configure: add missing CONFIG_FOO variables

The meson.build feature summary checks the presence of CONFIG_FOO variables. Several of these variables are never emitted by ./configure so the feature summary always shows these features as disabled.

Stefan Hajnoczi (3):
configure: add missing CONFIG_TCMALLOC
configure: add missing CONFIG_JEMALLOC
configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI

 configure   | 10 +++++++++-
 Makefile    |  2 +-
 meson.build |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/3 configure: add missing CONFIG_TCMALLOC

The feature summary in meson.build checks for CONFIG_TCMALLOC:

summary_info += {'tcmalloc support': config_host.has_key('CONFIG_TCMALLOC')}

Nothing emits CONFIG_TCMALLOC in ./configure so this feature appears disabled even if it has been enabled.

---
 configure | 4 ++++
 1 file changed, 4 insertions(+)
configure +4 -0
index 2b6a1196da..9f5b3a8897 100755
@@ -7027,6 +7027,10 @@ if test "$malloc_trim" = "yes" ; then
   echo "CONFIG_MALLOC_TRIM=y" >> $config_host_mak
 fi
 
+if test "$tcmalloc" = "yes" ; then
+  echo "CONFIG_TCMALLOC=y" >> $config_host_mak
+fi
+
 if test "$avx2_opt" = "yes" ; then
   echo "CONFIG_AVX2_OPT=y" >> $config_host_mak
 fi
Signature · 1 line
2.26.2
#2 lore raw

PATCH 2/3 configure: add missing CONFIG_JEMALLOC

In reply to Stefan Hajnoczi

The feature summary in meson.build checks for CONFIG_JEMALLOC:

summary_info += {'jemalloc support': config_host.has_key('CONFIG_JEMALLOC')}

Nothing emits CONFIG_JEMALLOC in ./configure so this feature appears disabled even if it has been enabled.

---
 configure | 4 ++++
 1 file changed, 4 insertions(+)
configure +4 -0
index 9f5b3a8897..a917456909 100755
@@ -7031,6 +7031,10 @@ if test "$tcmalloc" = "yes" ; then
   echo "CONFIG_TCMALLOC=y" >> $config_host_mak
 fi
 
+if test "$jemalloc" = "yes" ; then
+  echo "CONFIG_JEMALLOC=y" >> $config_host_mak
+fi
+
 if test "$avx2_opt" = "yes" ; then
   echo "CONFIG_AVX2_OPT=y" >> $config_host_mak
 fi
Signature · 1 line
2.26.2
#3 lore raw

PATCH 3/3 configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI

In reply to Stefan Hajnoczi

The QEMU_GA_MSI_ENABLED config-host.mak variable is emitted by ./configure. meson.build actually checks for CONFIG_QGA_MSI_ENABLED:

summary_info += {'QGA MSI support': config_host.has_key('CONFIG_QGA_MSI_ENABLED')}

Rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI for consistency with CONFIG_QGA_VSS. Also use 'y' instead of 'yes' for consistency.

This fixes the feature summary printed by meson.build.

---
 configure   | 2 +-
 Makefile    | 2 +-
 meson.build | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
configure +1 -1
index a917456909..fd120d54fb 100755
@@ -6569,7 +6569,7 @@ if test "$mingw32" = "yes" ; then
     echo "CONFIG_QGA_NTDDSCSI=y" >> $config_host_mak
   fi
   if test "$guest_agent_msi" = "yes"; then
-    echo "QEMU_GA_MSI_ENABLED=yes" >> $config_host_mak
+    echo "CONFIG_QGA_MSI=y" >> $config_host_mak
     echo "QEMU_GA_MSI_MINGW_DLL_PATH=${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $config_host_mak
     echo "QEMU_GA_MSI_WITH_VSS=${QEMU_GA_MSI_WITH_VSS}" >> $config_host_mak
     echo "QEMU_GA_MSI_ARCH=${QEMU_GA_MSI_ARCH}" >> $config_host_mak
Makefile +1 -1
index 57f72f56c6..83f1124cbf 100644
@@ -286,7 +286,7 @@ endif
 ifdef CONFIG_WIN32
 	@echo  'Windows targets:'
 	$(call print-help,installer,Build NSIS-based installer for QEMU)
-ifdef QEMU_GA_MSI_ENABLED
+ifdef CONFIG_QGA_MSI
 	$(call print-help,msi,Build MSI-based installer for qemu-ga)
 endif
 	@echo  ''
meson.build +1 -1
index 690723b470..057f6476e6 100644
@@ -1483,7 +1483,7 @@ if targetos == 'windows'
   endif
   summary_info += {'QGA VSS support':   config_host.has_key('CONFIG_QGA_VSS')}
   summary_info += {'QGA w32 disk info': config_host.has_key('CONFIG_QGA_NTDDSCSI')}
-  summary_info += {'QGA MSI support':   config_host.has_key('CONFIG_QGA_MSI_ENABLED')}
+  summary_info += {'QGA MSI support':   config_host.has_key('CONFIG_QGA_MSI')}
 endif
 summary_info += {'seccomp support':   config_host.has_key('CONFIG_SECCOMP')}
 summary_info += {'coroutine backend': config_host['CONFIG_COROUTINE_BACKEND']}
Signature · 1 line
2.26.2
#4 lore raw
In reply to Stefan Hajnoczi
Quoted 9 lines · Stefan Hajnoczi

The meson.build feature summary checks the presence of CONFIG_FOO variables. Several of these variables are never emitted by ./configure so the feature summary always shows these features as disabled.

Stefan Hajnoczi (3):
configure: add missing CONFIG_TCMALLOC
configure: add missing CONFIG_JEMALLOC
configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI

Quoted 5 lines
 configure   | 10 +++++++++-
 Makefile    |  2 +-
 meson.build |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

Thanks!

For 1 and 2 I think it's simpler to move the whole test to Meson. I already have a patch for that, though I was going to send it next week.

Paolo

#5 lore raw
Quoted 16 lines · Paolo Bonzini
Quoted 9 lines · Stefan Hajnoczi

The meson.build feature summary checks the presence of CONFIG_FOO variables. Several of these variables are never emitted by ./configure so the feature summary always shows these features as disabled.

Stefan Hajnoczi (3):
configure: add missing CONFIG_TCMALLOC
configure: add missing CONFIG_JEMALLOC
configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI

Quoted 5 lines
 configure   | 10 +++++++++-
 Makefile    |  2 +-
 meson.build |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)
Quoted 4 lines

Thanks!

For 1 and 2 I think it's simpler to move the whole test to Meson. I already have a patch for that, though I was going to send it next week.

Great, it's nice to do feature checks in meson instead of ./configure.

Stefan