[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 32/51] meson: list leftover CONFIG_* symbols
From: |
Paolo Bonzini |
Subject: |
[PULL 32/51] meson: list leftover CONFIG_* symbols |
Date: |
Thu, 7 Sep 2023 14:59:41 +0200 |
There are no config-host.mak symbols anymore that are needed in
config-host.h; the only symbols that are included in config_host_data via
the foreach loop are:
- CONFIG_DEFAULT_TARGETS, which is not used by C code.
- CONFIG_TCG and CONFIG_TCG_INTERPRETER, which are not part of config-host.mak
So, list these two symbols explicitly.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
docs/devel/build-system.rst | 8 ++------
meson.build | 12 ++++--------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst
index 64efa26b905..0f990bb3e90 100644
--- a/docs/devel/build-system.rst
+++ b/docs/devel/build-system.rst
@@ -460,17 +460,13 @@ Built by configure:
``config-host.mak``
When configure has determined the characteristics of the build host it
- will write them to this file for use in ``Makefile`` and to a smaller
- extent ``meson.build``. These include the paths to various tools and a
- variety of ``CONFIG_*`` variables related to optionally enabled features.
+ will write the paths to various tools to this file, for use in ``Makefile``
+ and to a smaller extent ``meson.build``.
``config-host.mak`` is also used as a dependency checking mechanism. If make
sees that the modification timestamp on configure is newer than that on
``config-host.mak``, then configure will be re-run.
- The variables defined here apply to all QEMU
- build outputs.
-
``config-meson.cross``
A Meson "cross file" (or native file) used to communicate the paths to
diff --git a/meson.build b/meson.build
index 16f0475955d..c24ea69f774 100644
--- a/meson.build
+++ b/meson.build
@@ -691,7 +691,6 @@ if get_option('tcg').allowed()
endif
if get_option('tcg_interpreter')
tcg_arch = 'tci'
- config_host += { 'CONFIG_TCG_INTERPRETER': 'y' }
elif host_arch == 'x86_64'
tcg_arch = 'i386'
elif host_arch == 'ppc64'
@@ -701,7 +700,6 @@ if get_option('tcg').allowed()
language: all_languages)
accelerators += 'CONFIG_TCG'
- config_host += { 'CONFIG_TCG': 'y' }
endif
if 'CONFIG_KVM' not in accelerators and get_option('kvm').enabled()
@@ -2132,6 +2130,10 @@ if seccomp.found()
endif
config_host_data.set('CONFIG_SNAPPY', snappy.found())
config_host_data.set('CONFIG_SOLARIS', targetos == 'sunos')
+if get_option('tcg').allowed()
+ config_host_data.set('CONFIG_TCG', 1)
+ config_host_data.set('CONFIG_TCG_INTERPRETER', tcg_arch == 'tci')
+endif
config_host_data.set('CONFIG_TPM', have_tpm)
config_host_data.set('CONFIG_TSAN', get_option('tsan'))
config_host_data.set('CONFIG_USB_LIBUSB', libusb.found())
@@ -2760,12 +2762,6 @@ if targetos == 'windows' and 'cpp' in all_languages
endif
config_host_data.set('HAVE_VSS_SDK', have_vss_sdk)
-foreach k, v: config_host
- if k.startswith('CONFIG_')
- config_host_data.set(k, v == 'y' ? 1 : v)
- endif
-endforeach
-
# Older versions of MinGW do not import _lock_file and _unlock_file properly.
# This was fixed for v6.0.0 with commit b48e3ac8969d.
if targetos == 'windows'
--
2.41.0
- Re: [PULL 24/51] meson: compile bundled device trees, (continued)
- [PULL 13/51] util/async-teardown.c: move to softmmu/, only build it when system build is requested, Paolo Bonzini, 2023/09/07
- [PULL 18/51] contrib/plugins/lockstep: Fix string format, Paolo Bonzini, 2023/09/07
- [PULL 19/51] contrib/plugins: add Darwin support, Paolo Bonzini, 2023/09/07
- [PULL 22/51] configure: remove HOST_CC, Paolo Bonzini, 2023/09/07
- [PULL 26/51] configure: move --enable-debug-tcg to meson, Paolo Bonzini, 2023/09/07
- [PULL 23/51] configure: create native file with contents of $host_cc, Paolo Bonzini, 2023/09/07
- [PULL 27/51] contrib/plugins: use an independent makefile, Paolo Bonzini, 2023/09/07
- [PULL 30/51] configure, meson: remove CONFIG_SOLARIS from config-host.mak, Paolo Bonzini, 2023/09/07
- [PULL 32/51] meson: list leftover CONFIG_* symbols,
Paolo Bonzini <=
- [PULL 29/51] configure, meson: move --enable-plugins to meson, Paolo Bonzini, 2023/09/07
- [PULL 31/51] configure, meson: remove target OS symbols from config-host.mak, Paolo Bonzini, 2023/09/07
- [PULL 35/51] mkvenv: assume presence of importlib.metadata, Paolo Bonzini, 2023/09/07
- [PULL 34/51] Python: Drop support for Python 3.7, Paolo Bonzini, 2023/09/07
- [PULL 33/51] configure: remove dead code, Paolo Bonzini, 2023/09/07
- [PULL 39/51] hw/i386/fw_cfg: Include missing 'cpu.h' header, Paolo Bonzini, 2023/09/07
- [PULL 38/51] hw/i386/pc: Include missing 'cpu.h' header, Paolo Bonzini, 2023/09/07
- [PULL 28/51] configure: unify recursion into sub-Makefiles, Paolo Bonzini, 2023/09/07
- [PULL 36/51] Revert "mkvenv: work around broken pip installations on Debian 10", Paolo Bonzini, 2023/09/07
- [PULL 37/51] hw/i386/pc: Include missing 'sysemu/tcg.h' header, Paolo Bonzini, 2023/09/07