diff options
| author | Richard Henderson | 2021-10-14 19:49:38 +0200 |
|---|---|---|
| committer | Richard Henderson | 2021-10-14 19:49:38 +0200 |
| commit | 4d1a525dfafe995a98bb486e702da09e31b68b9c (patch) | |
| tree | a799bf5d234cc2059f91287f527e7a52d1352f5c /hw | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-tcg-20211013' into staging (diff) | |
| parent | configure: automatically parse command line for meson -D options (diff) | |
| download | qemu-4d1a525dfafe995a98bb486e702da09e31b68b9c.tar.gz qemu-4d1a525dfafe995a98bb486e702da09e31b68b9c.tar.xz qemu-4d1a525dfafe995a98bb486e702da09e31b68b9c.zip | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* Meson conversions + introspection-based command line parser
# gpg: Signature made Thu 14 Oct 2021 12:51:54 AM PDT
# gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg: issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
* remotes/bonzini/tags/for-upstream: (26 commits)
configure: automatically parse command line for meson -D options
meson-buildoptions: include list of tracing backends
configure: prepare for auto-generated option parsing
configure: accept "internal" for --enable-capstone/slirp/fdt
configure: remove deprecated --{enable, disable}-git-update
configure, meson: move more compiler checks to Meson
configure: remove obsolete Solaris ar check
configure, meson: move Spice configure handling to meson
configure, meson: move netmap detection to meson
configure, meson: move vde detection to meson
configure, meson: move libaio check to meson.build
configure, meson: move pthread_setname_np checks to Meson
configure, meson: move remaining HAVE_* compiler tests to Meson
meson: HAVE_GDB_BIN is not used by C code
configure, meson: remove CONFIG_GCOV from config-host.mak
configure, meson: get HOST_WORDS_BIGENDIAN via the machine object
configure, meson: move CONFIG_HOST_DSOSUF to Meson
trace: move configuration from configure to Meson
trace: simple: pass trace_file unmodified to config-host.h
configure, meson: move fuzzing configuration to Meson
...
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/mem/Kconfig | 3 | ||||
| -rw-r--r-- | hw/mem/meson.build | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig index 8b19fdc49f..03dbb3c7df 100644 --- a/hw/mem/Kconfig +++ b/hw/mem/Kconfig @@ -8,3 +8,6 @@ config MEM_DEVICE config NVDIMM bool select MEM_DEVICE + +config SPARSE_MEM + bool diff --git a/hw/mem/meson.build b/hw/mem/meson.build index 3c8fdef9f9..82f86d117e 100644 --- a/hw/mem/meson.build +++ b/hw/mem/meson.build @@ -6,4 +6,4 @@ mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c')) softmmu_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss) -softmmu_ss.add(when: 'CONFIG_FUZZ', if_true: files('sparse-mem.c')) +softmmu_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c')) |