[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/26] kconfig: split CONFIG_SPARSE_MEM from fuzzing
From: |
Paolo Bonzini |
Subject: |
[PULL 06/26] kconfig: split CONFIG_SPARSE_MEM from fuzzing |
Date: |
Thu, 14 Oct 2021 18:29:18 +0200 |
Pass CONFIG_FUZZ via host_kconfig, and use it to select the
sparse-mem device.
Cc: Alexander Oleinik <alxndr@bu.edu>
Reviewed-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Alexander Bulekov <alxndr@bu.edu>
Message-Id: <20211007130829.632254-1-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Kconfig.host | 4 ++++
hw/mem/Kconfig | 3 +++
hw/mem/meson.build | 2 +-
meson.build | 1 +
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/Kconfig.host b/Kconfig.host
index 24255ef441..60b9c07b5e 100644
--- a/Kconfig.host
+++ b/Kconfig.host
@@ -41,3 +41,7 @@ config PVRDMA
config MULTIPROCESS_ALLOWED
bool
imply MULTIPROCESS
+
+config FUZZ
+ bool
+ select SPARSE_MEM
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'))
diff --git a/meson.build b/meson.build
index 0b9ebf9bfb..4a584760aa 100644
--- a/meson.build
+++ b/meson.build
@@ -1599,6 +1599,7 @@ endif
have_ivshmem = config_host_data.get('CONFIG_EVENTFD')
host_kconfig = \
+ ('CONFIG_FUZZ' in config_host ? ['CONFIG_FUZZ=y'] : []) + \
('CONFIG_TPM' in config_host ? ['CONFIG_TPM=y'] : []) + \
('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=y'] : []) + \
(have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \
--
2.31.1
- [PULL 00/26] Meson changes for 2021-10-14, Paolo Bonzini, 2021/10/14
- [PULL 02/26] audio: remove CONFIG_AUDIO_WIN_INT, Paolo Bonzini, 2021/10/14
- [PULL 05/26] configure: add command line options for audio drivers, Paolo Bonzini, 2021/10/14
- [PULL 06/26] kconfig: split CONFIG_SPARSE_MEM from fuzzing,
Paolo Bonzini <=
- [PULL 01/26] configure: remove --oss-lib, Paolo Bonzini, 2021/10/14
- [PULL 04/26] meson: define symbols for all available audio drivers, Paolo Bonzini, 2021/10/14
- [PULL 03/26] configure, meson: move audio driver detection to Meson, Paolo Bonzini, 2021/10/14
- [PULL 10/26] configure, meson: move CONFIG_HOST_DSOSUF to Meson, Paolo Bonzini, 2021/10/14
- [PULL 08/26] trace: simple: pass trace_file unmodified to config-host.h, Paolo Bonzini, 2021/10/14
- [PULL 07/26] configure, meson: move fuzzing configuration to Meson, Paolo Bonzini, 2021/10/14
- [PULL 09/26] trace: move configuration from configure to Meson, Paolo Bonzini, 2021/10/14
- [PULL 11/26] configure, meson: get HOST_WORDS_BIGENDIAN via the machine object, Paolo Bonzini, 2021/10/14
- [PULL 12/26] configure, meson: remove CONFIG_GCOV from config-host.mak, Paolo Bonzini, 2021/10/14
- [PULL 14/26] configure, meson: move remaining HAVE_* compiler tests to Meson, Paolo Bonzini, 2021/10/14