From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Cole Robinson" <crobinso@redhat.com>
Subject: [PATCH v4 01/10] qemu/atomic: Use macros for CONFIG_ATOMIC64
Date: Tue, 20 Jul 2021 11:37:14 -1000 [thread overview]
Message-ID: <20210720213723.630552-2-richard.henderson@linaro.org> (raw)
In-Reply-To: <20210720213723.630552-1-richard.henderson@linaro.org>
Clang warnings about questionable atomic usage get localized
to the inline function in atomic.h. By using a macro, we get
the full traceback to the original use that caused the warning.
Tested-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/qemu/atomic.h | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/include/qemu/atomic.h b/include/qemu/atomic.h
index 3ccf84fd46..a7654d2a33 100644
--- a/include/qemu/atomic.h
+++ b/include/qemu/atomic.h
@@ -457,26 +457,15 @@
/* Abstractions to access atomically (i.e. "once") i64/u64 variables */
#ifdef CONFIG_ATOMIC64
-static inline int64_t qatomic_read_i64(const int64_t *ptr)
-{
- /* use __nocheck because sizeof(void *) might be < sizeof(u64) */
- return qatomic_read__nocheck(ptr);
-}
-
-static inline uint64_t qatomic_read_u64(const uint64_t *ptr)
-{
- return qatomic_read__nocheck(ptr);
-}
-
-static inline void qatomic_set_i64(int64_t *ptr, int64_t val)
-{
- qatomic_set__nocheck(ptr, val);
-}
-
-static inline void qatomic_set_u64(uint64_t *ptr, uint64_t val)
-{
- qatomic_set__nocheck(ptr, val);
-}
+/* Use __nocheck because sizeof(void *) might be < sizeof(u64) */
+#define qatomic_read_i64(P) \
+ _Generic(*(P), int64_t: qatomic_read__nocheck(P))
+#define qatomic_read_u64(P) \
+ _Generic(*(P), uint64_t: qatomic_read__nocheck(P))
+#define qatomic_set_i64(P, V) \
+ _Generic(*(P), int64_t: qatomic_set__nocheck(P, V))
+#define qatomic_set_u64(P, V) \
+ _Generic(*(P), uint64_t: qatomic_set__nocheck(P, V))
static inline void qatomic64_init(void)
{
--
2.25.1
next prev parent reply other threads:[~2021-07-20 21:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 21:37 [PATCH v4 00/10] Atomic cleanup + clang-12 build fix Richard Henderson
2021-07-20 21:37 ` Richard Henderson [this message]
2021-07-20 21:37 ` [PATCH v4 02/10] qemu/atomic: Remove pre-C11 atomic fallbacks Richard Henderson
2021-07-20 21:37 ` [PATCH v4 03/10] qemu/atomic: Add aligned_{int64,uint64}_t types Richard Henderson
2021-07-20 21:37 ` [PATCH v4 04/10] tcg: Rename helper_atomic_*_mmu and provide for user-only Richard Henderson
2021-07-20 21:37 ` [PATCH v4 05/10] accel/tcg: Standardize atomic helpers on softmmu api Richard Henderson
2021-07-20 21:37 ` [PATCH v4 06/10] accel/tcg: Fold EXTRA_ARGS into atomic_template.h Richard Henderson
2021-07-20 21:37 ` [PATCH v4 07/10] accel/tcg: Remove ATOMIC_MMU_DECLS Richard Henderson
2021-07-20 21:37 ` [PATCH v4 08/10] accel/tcg: Expand ATOMIC_MMU_LOOKUP_* Richard Henderson
2021-07-20 21:37 ` [PATCH v4 09/10] trace: Fold mem-internal.h into mem.h Richard Henderson
2021-07-20 21:37 ` [PATCH v4 10/10] accel/tcg: Push trace info building into atomic_common.c.inc Richard Henderson
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=20210720213723.630552-2-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=crobinso@redhat.com \
--cc=f4bug@amsat.org \
--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).