accel/tcg: Finish replacing SOFTMMU -> SYSTEM

[PATCH-for-9.1 12/12] exec/poison: Poison CONFIG_SOFTMMU again

Posted by Philippe Mathieu-Daudé 8 months, 2 weeks ago

Now that the confusion around SOFTMMU vs SYSTEM emulation
was clarified, we can restore the CONFIG_SOFTMMU poison
pragma.

This reverts commit d31b84041d4353ef310ffde23c87b78c2aa32ead
("exec/poison: Do not poison CONFIG_SOFTMMU").

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/exec/poison.h         | 1 +
 scripts/make-config-poison.sh | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/exec/poison.h b/include/exec/poison.h
index 1ea5633eb3..fbec710f6c 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -84,6 +84,7 @@
 #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 2b36907e23..6ef5580f84 100755
--- a/scripts/make-config-poison.sh
+++ b/scripts/make-config-poison.sh
@@ -9,7 +9,6 @@ fi
 exec sed -n \
   -e' /CONFIG_TCG/d' \
   -e '/CONFIG_USER_ONLY/d' \
-  -e '/CONFIG_SOFTMMU/d' \
   -e '/^#define / {' \
   -e    's///' \
   -e    's/ .*//' \
-- 
2.41.0

Re: [PATCH-for-9.1 12/12] exec/poison: Poison CONFIG_SOFTMMU again

Posted by Richard Henderson 8 months, 2 weeks ago

On 3/13/24 11:33, Philippe Mathieu-Daudé wrote:
> Now that the confusion around SOFTMMU vs SYSTEM emulation
> was clarified, we can restore the CONFIG_SOFTMMU poison
> pragma.
> 
> This reverts commit d31b84041d4353ef310ffde23c87b78c2aa32ead
> ("exec/poison: Do not poison CONFIG_SOFTMMU").
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/exec/poison.h         | 1 +
>   scripts/make-config-poison.sh | 1 -
>   2 files changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/exec/poison.h b/include/exec/poison.h
> index 1ea5633eb3..fbec710f6c 100644
> --- a/include/exec/poison.h
> +++ b/include/exec/poison.h
> @@ -84,6 +84,7 @@
>   #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 2b36907e23..6ef5580f84 100755
> --- a/scripts/make-config-poison.sh
> +++ b/scripts/make-config-poison.sh
> @@ -9,7 +9,6 @@ fi
>   exec sed -n \
>     -e' /CONFIG_TCG/d' \
>     -e '/CONFIG_USER_ONLY/d' \
> -  -e '/CONFIG_SOFTMMU/d' \
>     -e '/^#define / {' \
>     -e    's///' \
>     -e    's/ .*//' \

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~