target/monitor: Cleanup around hmp_info_tlb()

[PATCH-for-9.0? 01/21] host/atomic128: Include missing 'qemu/atomic.h' header

Posted by Philippe Mathieu-Daudé 1 year, 10 months ago

qatomic_cmpxchg__nocheck(), qatomic_read__nocheck(),
qatomic_set__nocheck() are defined in "qemu/atomic.h".
Include it in order to avoid:

  In file included from include/exec/helper-proto.h:10:
  In file included from include/exec/helper-proto-common.h:10:
  In file included from include/qemu/atomic128.h:61:
  In file included from host/include/aarch64/host/atomic128-cas.h:16:
  host/include/generic/host/atomic128-cas.h:23:11: error: call to undeclared function 'qatomic_cmpxchg__nocheck'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
    r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i);
          ^

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 host/include/generic/host/atomic128-cas.h  | 2 ++
 host/include/generic/host/atomic128-ldst.h | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/host/include/generic/host/atomic128-cas.h b/host/include/generic/host/atomic128-cas.h
index 6b40cc2271..4824f14659 100644
--- a/host/include/generic/host/atomic128-cas.h
+++ b/host/include/generic/host/atomic128-cas.h
@@ -11,6 +11,8 @@
 #ifndef HOST_ATOMIC128_CAS_H
 #define HOST_ATOMIC128_CAS_H
 
+#include "qemu/atomic.h"
+
 #if defined(CONFIG_ATOMIC128)
 static inline Int128 ATTRIBUTE_ATOMIC128_OPT
 atomic16_cmpxchg(Int128 *ptr, Int128 cmp, Int128 new)
diff --git a/host/include/generic/host/atomic128-ldst.h b/host/include/generic/host/atomic128-ldst.h
index 691e6a8531..12e4aca2da 100644
--- a/host/include/generic/host/atomic128-ldst.h
+++ b/host/include/generic/host/atomic128-ldst.h
@@ -11,6 +11,8 @@
 #ifndef HOST_ATOMIC128_LDST_H
 #define HOST_ATOMIC128_LDST_H
 
+#include "qemu/atomic.h"
+
 #if defined(CONFIG_ATOMIC128)
 # define HAVE_ATOMIC128_RO 1
 # define HAVE_ATOMIC128_RW 1
-- 
2.41.0

Re: [PATCH-for-9.0? 01/21] host/atomic128: Include missing 'qemu/atomic.h' header

Posted by Richard Henderson 1 year, 10 months ago

On 3/21/24 05:48, Philippe Mathieu-Daudé wrote:
> qatomic_cmpxchg__nocheck(), qatomic_read__nocheck(),
> qatomic_set__nocheck() are defined in "qemu/atomic.h".
> Include it in order to avoid:
> 
>    In file included from include/exec/helper-proto.h:10:
>    In file included from include/exec/helper-proto-common.h:10:
>    In file included from include/qemu/atomic128.h:61:
>    In file included from host/include/aarch64/host/atomic128-cas.h:16:
>    host/include/generic/host/atomic128-cas.h:23:11: error: call to undeclared function 'qatomic_cmpxchg__nocheck'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
>      r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i);


Nak.  We can rename these host/include/*/host/*atomic* as .h.inc if you need, but the 
top-level header is include/qemu/atomic128.h.


r~

Re: [PATCH-for-9.0? 01/21] host/atomic128: Include missing 'qemu/atomic.h' header

Posted by Philippe Mathieu-Daudé 1 year, 9 months ago

On 21/3/24 18:05, Richard Henderson wrote:
> On 3/21/24 05:48, Philippe Mathieu-Daudé wrote:
>> qatomic_cmpxchg__nocheck(), qatomic_read__nocheck(),
>> qatomic_set__nocheck() are defined in "qemu/atomic.h".
>> Include it in order to avoid:
>>
>>    In file included from include/exec/helper-proto.h:10:
>>    In file included from include/exec/helper-proto-common.h:10:
>>    In file included from include/qemu/atomic128.h:61:
>>    In file included from host/include/aarch64/host/atomic128-cas.h:16:
>>    host/include/generic/host/atomic128-cas.h:23:11: error: call to 
>> undeclared function 'qatomic_cmpxchg__nocheck'; ISO C99 and later do 
>> not support implicit function declarations 
>> [-Wimplicit-function-declaration]
>>      r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i);
> 
> 
> Nak.  We can rename these host/include/*/host/*atomic* as .h.inc if you 
> need, but the top-level header is include/qemu/atomic128.h.

Patch available here:
https://lore.kernel.org/qemu-devel/20240418160943.95047-3-philmd@linaro.org/