[PATCH 0/3] qemu/atomic: Header cleanups

[PATCH 0/3] qemu/atomic: Header cleanups

[Philippe Mathieu-Daudé]

- Include "qemu/atomic.h" in "qemu/atomic128.h"
- Use .h.inc suffix

Philippe Mathieu-Daudé (3):
  qemu/atomic: Rename atomic128-cas.h headers using .h.inc suffix
  qemu/atomic: Rename atomic128-ldst.h headers using .h.inc suffix
  qemu/atomic128: Include missing 'qemu/atomic.h' header

 host/include/aarch64/host/atomic128-cas.h                    | 2 +-
 include/qemu/atomic128.h                                     | 5 +++--
 .../aarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc}  | 0
 .../generic/host/{atomic128-cas.h => atomic128-cas.h.inc}    | 0
 .../generic/host/{atomic128-ldst.h => atomic128-ldst.h.inc}  | 0
 .../host/{atomic128-ldst.h => atomic128-ldst.h.inc}          | 0
 .../x86_64/host/{atomic128-ldst.h => atomic128-ldst.h.inc}   | 2 +-
 host/include/x86_64/host/load-extract-al16-al8.h.inc         | 2 +-
 8 files changed, 6 insertions(+), 5 deletions(-)
 rename host/include/aarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%)
 rename host/include/generic/host/{atomic128-cas.h => atomic128-cas.h.inc} (100%)
 rename host/include/generic/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%)
 rename host/include/loongarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%)
 rename host/include/x86_64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (96%)

-- 
2.45.2

[PATCH 1/3] qemu/atomic: Rename atomic128-cas.h headers using .h.inc suffix

[Philippe Mathieu-Daudé]

Since commit 139c1837db ("meson: rename included C source files
to .c.inc"), QEMU standard procedure for included C files is to
use *.c.inc.

Besides, since commit 6a0057aa22 ("docs/devel: make a statement
about includes") this is documented in the Coding Style:

  If you do use template header files they should be named with
  the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
  being included for expansion.

Therefore rename 'atomic128-cas.h' as 'atomic128-cas.h.inc'.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 host/include/aarch64/host/atomic128-cas.h                       | 2 +-
 include/qemu/atomic128.h                                        | 2 +-
 .../generic/host/{atomic128-cas.h => atomic128-cas.h.inc}       | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename host/include/generic/host/{atomic128-cas.h => atomic128-cas.h.inc} (100%)

diff --git a/host/include/aarch64/host/atomic128-cas.h b/host/include/aarch64/host/atomic128-cas.h
index 58630107bcc..991da4ef543 100644
--- a/host/include/aarch64/host/atomic128-cas.h
+++ b/host/include/aarch64/host/atomic128-cas.h
@@ -13,7 +13,7 @@
 
 /* Through gcc 10, aarch64 has no support for 128-bit atomics.  */
 #if defined(CONFIG_ATOMIC128) || defined(CONFIG_CMPXCHG128)
-#include "host/include/generic/host/atomic128-cas.h"
+#include "host/include/generic/host/atomic128-cas.h.inc"
 #else
 static inline Int128 atomic16_cmpxchg(Int128 *ptr, Int128 cmp, Int128 new)
 {
diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h
index 88af6d4ea3f..03c27022f0c 100644
--- a/include/qemu/atomic128.h
+++ b/include/qemu/atomic128.h
@@ -58,7 +58,7 @@
  * Therefore, special case each platform.
  */
 
-#include "host/atomic128-cas.h"
+#include "host/atomic128-cas.h.inc"
 #include "host/atomic128-ldst.h"
 
 #endif /* QEMU_ATOMIC128_H */
diff --git a/host/include/generic/host/atomic128-cas.h b/host/include/generic/host/atomic128-cas.h.inc
similarity index 100%
rename from host/include/generic/host/atomic128-cas.h
rename to host/include/generic/host/atomic128-cas.h.inc
-- 
2.45.2

[PATCH 2/3] qemu/atomic: Rename atomic128-ldst.h headers using .h.inc suffix

[Philippe Mathieu-Daudé]

Since commit 139c1837db ("meson: rename included C source files
to .c.inc"), QEMU standard procedure for included C files is to
use *.c.inc.

Besides, since commit 6a0057aa22 ("docs/devel: make a statement
about includes") this is documented in the Coding Style:

  If you do use template header files they should be named with
  the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
  being included for expansion.

Therefore rename 'atomic128-ldst.h' as 'atomic128-ldst.h.inc'.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/qemu/atomic128.h                                        | 2 +-
 .../aarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc}     | 0
 .../generic/host/{atomic128-ldst.h => atomic128-ldst.h.inc}     | 0
 .../loongarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} | 0
 .../x86_64/host/{atomic128-ldst.h => atomic128-ldst.h.inc}      | 2 +-
 host/include/x86_64/host/load-extract-al16-al8.h.inc            | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename host/include/aarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%)
 rename host/include/generic/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%)
 rename host/include/loongarch64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (100%)
 rename host/include/x86_64/host/{atomic128-ldst.h => atomic128-ldst.h.inc} (96%)

diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h
index 03c27022f0c..448fb644799 100644
--- a/include/qemu/atomic128.h
+++ b/include/qemu/atomic128.h
@@ -59,6 +59,6 @@
  */
 
 #include "host/atomic128-cas.h.inc"
-#include "host/atomic128-ldst.h"
+#include "host/atomic128-ldst.h.inc"
 
 #endif /* QEMU_ATOMIC128_H */
diff --git a/host/include/aarch64/host/atomic128-ldst.h b/host/include/aarch64/host/atomic128-ldst.h.inc
similarity index 100%
rename from host/include/aarch64/host/atomic128-ldst.h
rename to host/include/aarch64/host/atomic128-ldst.h.inc
diff --git a/host/include/generic/host/atomic128-ldst.h b/host/include/generic/host/atomic128-ldst.h.inc
similarity index 100%
rename from host/include/generic/host/atomic128-ldst.h
rename to host/include/generic/host/atomic128-ldst.h.inc
diff --git a/host/include/loongarch64/host/atomic128-ldst.h b/host/include/loongarch64/host/atomic128-ldst.h.inc
similarity index 100%
rename from host/include/loongarch64/host/atomic128-ldst.h
rename to host/include/loongarch64/host/atomic128-ldst.h.inc
diff --git a/host/include/x86_64/host/atomic128-ldst.h b/host/include/x86_64/host/atomic128-ldst.h.inc
similarity index 96%
rename from host/include/x86_64/host/atomic128-ldst.h
rename to host/include/x86_64/host/atomic128-ldst.h.inc
index 8d6f909d3c9..4c698e3246f 100644
--- a/host/include/x86_64/host/atomic128-ldst.h
+++ b/host/include/x86_64/host/atomic128-ldst.h.inc
@@ -69,7 +69,7 @@ static inline void atomic16_set(Int128 *ptr, Int128 val)
 }
 #else
 /* Provide QEMU_ERROR stubs. */
-#include "host/include/generic/host/atomic128-ldst.h"
+#include "host/include/generic/host/atomic128-ldst.h.inc"
 #endif
 
 #endif /* X86_64_ATOMIC128_LDST_H */
diff --git a/host/include/x86_64/host/load-extract-al16-al8.h.inc b/host/include/x86_64/host/load-extract-al16-al8.h.inc
index baa506b7b5b..b837c378684 100644
--- a/host/include/x86_64/host/load-extract-al16-al8.h.inc
+++ b/host/include/x86_64/host/load-extract-al16-al8.h.inc
@@ -9,7 +9,7 @@
 #define X86_64_LOAD_EXTRACT_AL16_AL8_H
 
 #ifdef CONFIG_INT128_TYPE
-#include "host/atomic128-ldst.h"
+#include "host/atomic128-ldst.h.inc"
 
 /**
  * load_atom_extract_al16_or_al8:
-- 
2.45.2

[PATCH 3/3] qemu/atomic128: Include missing 'qemu/atomic.h' header

[Philippe Mathieu-Daudé]

qatomic_cmpxchg__nocheck() is declared in "qemu/atomic.h".
Include it in order to avoid when refactoring unrelated headers:

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

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 include/qemu/atomic128.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h
index 448fb644799..31e5c48d8fa 100644
--- a/include/qemu/atomic128.h
+++ b/include/qemu/atomic128.h
@@ -13,6 +13,7 @@
 #ifndef QEMU_ATOMIC128_H
 #define QEMU_ATOMIC128_H
 
+#include "qemu/atomic.h"
 #include "qemu/int128.h"
 
 /*
-- 
2.45.2

Re: [PATCH 1/3] qemu/atomic: Rename atomic128-cas.h headers using .h.inc suffix

[Richard Henderson]

On 12/12/24 08:10, Philippe Mathieu-Daudé wrote:
> Since commit 139c1837db ("meson: rename included C source files
> to .c.inc"), QEMU standard procedure for included C files is to
> use *.c.inc.
> 
> Besides, since commit 6a0057aa22 ("docs/devel: make a statement
> about includes") this is documented in the Coding Style:
> 
>    If you do use template header files they should be named with
>    the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
>    being included for expansion.
> 
> Therefore rename 'atomic128-cas.h' as 'atomic128-cas.h.inc'.

But these are not templates, nor included multiple times, so...
I don't get it.


r~

Re: [PATCH 3/3] qemu/atomic128: Include missing 'qemu/atomic.h' header

[Richard Henderson]

On 12/12/24 08:10, Philippe Mathieu-Daudé wrote:
> qatomic_cmpxchg__nocheck() is declared in "qemu/atomic.h".
> Include it in order to avoid when refactoring unrelated headers:
> 
>      In file included from ../../accel/tcg/tcg-runtime-gvec.c:22:
>      In file included from include/exec/helper-proto-common.h:10:
>      In file included from include/qemu/atomic128.h:61:
>      host/include/generic/host/atomic128-cas.h.inc:23:11: error: call to undeclared function 'qatomic_cmpxchg__nocheck'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
>         23 |     r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i);
>            |           ^
>      1 error generated.
> 
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   include/qemu/atomic128.h | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/include/qemu/atomic128.h b/include/qemu/atomic128.h
> index 448fb644799..31e5c48d8fa 100644
> --- a/include/qemu/atomic128.h
> +++ b/include/qemu/atomic128.h
> @@ -13,6 +13,7 @@
>   #ifndef QEMU_ATOMIC128_H
>   #define QEMU_ATOMIC128_H
>   
> +#include "qemu/atomic.h"
>   #include "qemu/int128.h"
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 1/3] qemu/atomic: Rename atomic128-cas.h headers using .h.inc suffix

[Philippe Mathieu-Daudé]

On 12/12/24 16:02, Richard Henderson wrote:
> On 12/12/24 08:10, Philippe Mathieu-Daudé wrote:
>> Since commit 139c1837db ("meson: rename included C source files
>> to .c.inc"), QEMU standard procedure for included C files is to
>> use *.c.inc.
>>
>> Besides, since commit 6a0057aa22 ("docs/devel: make a statement
>> about includes") this is documented in the Coding Style:
>>
>>    If you do use template header files they should be named with
>>    the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
>>    being included for expansion.
>>
>> Therefore rename 'atomic128-cas.h' as 'atomic128-cas.h.inc'.
> 
> But these are not templates, nor included multiple times, so...
> I don't get it.
I wanted to avoid including "qemu/atomic.h" in each of them due to:

     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]
        23 |     r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i);
           |           ^
     1 error generated.

Re: [PATCH 1/3] qemu/atomic: Rename atomic128-cas.h headers using .h.inc suffix

[Richard Henderson]

On 12/12/24 09:09, Philippe Mathieu-Daudé wrote:
> On 12/12/24 16:02, Richard Henderson wrote:
>> On 12/12/24 08:10, Philippe Mathieu-Daudé wrote:
>>> Since commit 139c1837db ("meson: rename included C source files
>>> to .c.inc"), QEMU standard procedure for included C files is to
>>> use *.c.inc.
>>>
>>> Besides, since commit 6a0057aa22 ("docs/devel: make a statement
>>> about includes") this is documented in the Coding Style:
>>>
>>>    If you do use template header files they should be named with
>>>    the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
>>>    being included for expansion.
>>>
>>> Therefore rename 'atomic128-cas.h' as 'atomic128-cas.h.inc'.
>>
>> But these are not templates, nor included multiple times, so...
>> I don't get it.
> I wanted to avoid including "qemu/atomic.h" in each of them due to:
> 
>      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]
>         23 |     r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i);
>            |           ^
>      1 error generated.

And why would you ever have that?

r~

Re: [PATCH 1/3] qemu/atomic: Rename atomic128-cas.h headers using .h.inc suffix

[Philippe Mathieu-Daudé]

On 12/12/24 16:11, Richard Henderson wrote:
> On 12/12/24 09:09, Philippe Mathieu-Daudé wrote:
>> On 12/12/24 16:02, Richard Henderson wrote:
>>> On 12/12/24 08:10, Philippe Mathieu-Daudé wrote:
>>>> Since commit 139c1837db ("meson: rename included C source files
>>>> to .c.inc"), QEMU standard procedure for included C files is to
>>>> use *.c.inc.
>>>>
>>>> Besides, since commit 6a0057aa22 ("docs/devel: make a statement
>>>> about includes") this is documented in the Coding Style:
>>>>
>>>>    If you do use template header files they should be named with
>>>>    the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
>>>>    being included for expansion.
>>>>
>>>> Therefore rename 'atomic128-cas.h' as 'atomic128-cas.h.inc'.
>>>
>>> But these are not templates, nor included multiple times, so...
>>> I don't get it.
>> I wanted to avoid including "qemu/atomic.h" in each of them due to:
>>
>>      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]
>>         23 |     r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i);
>>            |           ^
>>      1 error generated.
> 
> And why would you ever have that?

To have "not template" headers self-contained; but I'm fine discarding
these 2 patches and keeping the last one of this series.

Re: [PATCH 1/3] qemu/atomic: Rename atomic128-cas.h headers using .h.inc suffix

[Richard Henderson]

On 12/12/24 09:17, Philippe Mathieu-Daudé wrote:
> On 12/12/24 16:11, Richard Henderson wrote:
>> On 12/12/24 09:09, Philippe Mathieu-Daudé wrote:
>>> On 12/12/24 16:02, Richard Henderson wrote:
>>>> On 12/12/24 08:10, Philippe Mathieu-Daudé wrote:
>>>>> Since commit 139c1837db ("meson: rename included C source files
>>>>> to .c.inc"), QEMU standard procedure for included C files is to
>>>>> use *.c.inc.
>>>>>
>>>>> Besides, since commit 6a0057aa22 ("docs/devel: make a statement
>>>>> about includes") this is documented in the Coding Style:
>>>>>
>>>>>    If you do use template header files they should be named with
>>>>>    the ``.c.inc`` or ``.h.inc`` suffix to make it clear they are
>>>>>    being included for expansion.
>>>>>
>>>>> Therefore rename 'atomic128-cas.h' as 'atomic128-cas.h.inc'.
>>>>
>>>> But these are not templates, nor included multiple times, so...
>>>> I don't get it.
>>> I wanted to avoid including "qemu/atomic.h" in each of them due to:
>>>
>>>      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]
>>>         23 |     r.i = qatomic_cmpxchg__nocheck(ptr_align, c.i, n.i);
>>>            |           ^
>>>      1 error generated.
>>
>> And why would you ever have that?
> 
> To have "not template" headers self-contained; but I'm fine discarding
> these 2 patches and keeping the last one of this series.

If you have another reason for the change, then that should be the reason in the commit 
message.  But what you copied from Coding Style isn't the reason.


r~