diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2023-04-30 08:54:23 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-06-05 12:04:29 -0700 |
| commit | d31b84041d4353ef310ffde23c87b78c2aa32ead (patch) | |
| tree | 8e57f2f8ca688390bfe68168bf88060fde53141a | |
| parent | 6fcc02292c74a271e8f377f25b6818ea5c1f36ff (diff) | |
| download | qemu-d31b84041d4353ef310ffde23c87b78c2aa32ead.zip qemu-d31b84041d4353ef310ffde23c87b78c2aa32ead.tar.gz qemu-d31b84041d4353ef310ffde23c87b78c2aa32ead.tar.bz2 | |
exec/poison: Do not poison CONFIG_SOFTMMU
If CONFIG_USER_ONLY is ok generically, so is CONFIG_SOFTMMU,
because they are exactly opposite.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | include/exec/poison.h | 1 | ||||
| -rwxr-xr-x | scripts/make-config-poison.sh | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/exec/poison.h b/include/exec/poison.h index 256736e..e94ee8d 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -85,7 +85,6 @@ #pragma GCC poison CONFIG_HVF #pragma GCC poison CONFIG_LINUX_USER #pragma GCC poison CONFIG_KVM -#pragma GCC poison CONFIG_SOFTMMU #pragma GCC poison CONFIG_WHPX #pragma GCC poison CONFIG_XEN diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh index 1892854..2b36907 100755 --- a/scripts/make-config-poison.sh +++ b/scripts/make-config-poison.sh @@ -4,11 +4,12 @@ if test $# = 0; then exit 0 fi -# Create list of config switches that should be poisoned in common code... -# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special. +# Create list of config switches that should be poisoned in common code, +# but filter out several which are handled manually. exec sed -n \ -e' /CONFIG_TCG/d' \ -e '/CONFIG_USER_ONLY/d' \ + -e '/CONFIG_SOFTMMU/d' \ -e '/^#define / {' \ -e 's///' \ -e 's/ .*//' \ |