| Message ID | 20230531040330.8950-48-richard.henderson@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | tcg: Build once for system, once for user | expand |
On 31/5/23 06:03, Richard Henderson wrote: > If CONFIG_USER_ONLY is ok generically, so is CONFIG_SOFTMMU, > because they are exactly opposite. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > include/exec/poison.h | 1 - > 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 256736e11a..e94ee8dfef 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 1892854261..2b36907e23 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/ .*//' \ Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/include/exec/poison.h b/include/exec/poison.h index 256736e11a..e94ee8dfef 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 1892854261..2b36907e23 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/ .*//' \
If CONFIG_USER_ONLY is ok generically, so is CONFIG_SOFTMMU, because they are exactly opposite. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- include/exec/poison.h | 1 - scripts/make-config-poison.sh | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-)