From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>
Subject: [RFC PATCH] configure: Poison (almost) all target-specific #defines
Date: Mon, 15 Mar 2021 14:54:10 +0100 [thread overview]
Message-ID: <20210315135410.221729-1-thuth@redhat.com> (raw)
We are generating a lot of target-specific defines in the *-config-devices.h
and *-config-target.h files. Using them in common code is wrong and leads
to very subtle bugs since a "#ifdef CONFIG_SOMETHING" is not working there
as expected. To avoid these issues, we are already poisoning some of the
macros in include/exec/poison.h - but maintaining this list manually is
cumbersome. Thus let's generate the list of poisoned macros automatically
instead.
Note that CONFIG_TCG (which is also defined in config-host.h) and
CONFIG_USER_ONLY are special, so we have to filter these out.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
RFC since the shell stuff in "configure" is quite ugly ... maybe there's
a better way to do this via meson, but my meson-foo is still lacking...
Makefile | 2 +-
configure | 5 +++++
include/exec/poison.h | 2 ++
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index bcbbec71a1..4cab10a2a4 100644
--- a/Makefile
+++ b/Makefile
@@ -213,7 +213,7 @@ qemu-%.tar.bz2:
distclean: clean
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || :
- rm -f config-host.mak config-host.h*
+ rm -f config-host.mak config-host.h* config-poison.h
rm -f tests/tcg/config-*.mak
rm -f config-all-disas.mak config.status
rm -f roms/seabios/config.mak roms/vgabios/config.mak
diff --git a/configure b/configure
index f7d022a5db..c7b5df3a5c 100755
--- a/configure
+++ b/configure
@@ -6441,6 +6441,11 @@ if test -n "${deprecated_features}"; then
echo " features: ${deprecated_features}"
fi
+cat *-config-devices.h *-config-target.h | grep '^#define ' \
+ | grep -v CONFIG_TCG | grep -v CONFIG_USER_ONLY \
+ | sed -e 's/#define //' -e 's/ .*//' | sort -u \
+ | sed -e 's/^/#pragma GCC poison /' > config-poison.h
+
# Save the configure command line for later reuse.
cat <<EOD >config.status
#!/bin/sh
diff --git a/include/exec/poison.h b/include/exec/poison.h
index 4cd3f8abb4..9e55d5aec2 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -4,6 +4,8 @@
#ifndef HW_POISON_H
#define HW_POISON_H
+#include "config-poison.h"
+
#pragma GCC poison TARGET_I386
#pragma GCC poison TARGET_X86_64
#pragma GCC poison TARGET_AARCH64
--
2.27.0
next reply other threads:[~2021-03-15 13:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-15 13:54 Thomas Huth [this message]
2021-03-15 14:07 ` [RFC PATCH] configure: Poison (almost) all target-specific #defines Claudio Fontana
2021-03-15 15:08 ` Thomas Huth
2021-03-15 15:22 ` Claudio Fontana
2021-03-15 14:52 ` Philippe Mathieu-Daudé
2021-03-15 15:24 ` Thomas Huth
2021-03-15 15:37 ` Peter Maydell
2021-03-15 15:52 ` Thomas Huth
2021-03-15 18:24 ` Eric Blake
2021-03-16 5:28 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210315135410.221729-1-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).