* [PATCH 1/3] configure: add missing CONFIG_TCMALLOC
2020-09-14 9:52 [PATCH 0/3] configure: add missing CONFIG_FOO variables Stefan Hajnoczi
@ 2020-09-14 9:52 ` Stefan Hajnoczi
2020-09-14 9:52 ` [PATCH 2/3] configure: add missing CONFIG_JEMALLOC Stefan Hajnoczi
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Stefan Hajnoczi @ 2020-09-14 9:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Michael Roth, Stefan Hajnoczi
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.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
configure | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure b/configure
index 2b6a1196da..9f5b3a8897 100755
--- a/configure
+++ b/configure
@@ -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
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] configure: add missing CONFIG_JEMALLOC
2020-09-14 9:52 [PATCH 0/3] configure: add missing CONFIG_FOO variables Stefan Hajnoczi
2020-09-14 9:52 ` [PATCH 1/3] configure: add missing CONFIG_TCMALLOC Stefan Hajnoczi
@ 2020-09-14 9:52 ` Stefan Hajnoczi
2020-09-14 9:52 ` [PATCH 3/3] configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI Stefan Hajnoczi
2020-09-14 10:50 ` [PATCH 0/3] configure: add missing CONFIG_FOO variables Paolo Bonzini
3 siblings, 0 replies; 6+ messages in thread
From: Stefan Hajnoczi @ 2020-09-14 9:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Michael Roth, 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.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
configure | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/configure b/configure
index 9f5b3a8897..a917456909 100755
--- a/configure
+++ b/configure
@@ -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
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI
2020-09-14 9:52 [PATCH 0/3] configure: add missing CONFIG_FOO variables Stefan Hajnoczi
2020-09-14 9:52 ` [PATCH 1/3] configure: add missing CONFIG_TCMALLOC Stefan Hajnoczi
2020-09-14 9:52 ` [PATCH 2/3] configure: add missing CONFIG_JEMALLOC Stefan Hajnoczi
@ 2020-09-14 9:52 ` Stefan Hajnoczi
2020-09-14 10:50 ` [PATCH 0/3] configure: add missing CONFIG_FOO variables Paolo Bonzini
3 siblings, 0 replies; 6+ messages in thread
From: Stefan Hajnoczi @ 2020-09-14 9:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Michael Roth, 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.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
configure | 2 +-
Makefile | 2 +-
meson.build | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index a917456909..fd120d54fb 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/Makefile b/Makefile
index 57f72f56c6..83f1124cbf 100644
--- a/Makefile
+++ b/Makefile
@@ -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 ''
diff --git a/meson.build b/meson.build
index 690723b470..057f6476e6 100644
--- a/meson.build
+++ b/meson.build
@@ -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']}
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] configure: add missing CONFIG_FOO variables
2020-09-14 9:52 [PATCH 0/3] configure: add missing CONFIG_FOO variables Stefan Hajnoczi
` (2 preceding siblings ...)
2020-09-14 9:52 ` [PATCH 3/3] configure: rename QEMU_GA_MSI_ENABLED to CONFIG_QGA_MSI Stefan Hajnoczi
@ 2020-09-14 10:50 ` Paolo Bonzini
2020-09-15 10:56 ` Stefan Hajnoczi
3 siblings, 1 reply; 6+ messages in thread
From: Paolo Bonzini @ 2020-09-14 10:50 UTC (permalink / raw)
To: Stefan Hajnoczi, qemu-devel; +Cc: Michael Roth
On 14/09/20 11:52, Stefan Hajnoczi wrote:
> 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(-)
>
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
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] configure: add missing CONFIG_FOO variables
2020-09-14 10:50 ` [PATCH 0/3] configure: add missing CONFIG_FOO variables Paolo Bonzini
@ 2020-09-15 10:56 ` Stefan Hajnoczi
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Hajnoczi @ 2020-09-15 10:56 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel, Michael Roth
[-- Attachment #1: Type: text/plain, Size: 916 bytes --]
On Mon, Sep 14, 2020 at 12:50:23PM +0200, Paolo Bonzini wrote:
> On 14/09/20 11:52, Stefan Hajnoczi wrote:
> > 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(-)
> >
>
> 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread