[PATCH] x86_64/atomic128-ldst.h: fix arch include guard

Frédéric Pétrot posted 1 patch 10 months, 3 weeks ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20230620083918.9134-1-frederic.petrot@univ-grenoble-alpes.fr
host/include/x86_64/host/atomic128-ldst.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
[PATCH] x86_64/atomic128-ldst.h: fix arch include guard
Posted by Frédéric Pétrot 10 months, 3 weeks ago
Fix arch name in the define that prevents multiple inclusions.

Signed-off-by: Frédéric Pétrot <frederic.petrot@univ-grenoble-alpes.fr>
---
 host/include/x86_64/host/atomic128-ldst.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/host/include/x86_64/host/atomic128-ldst.h b/host/include/x86_64/host/atomic128-ldst.h
index adc9332f91..d0240d4212 100644
--- a/host/include/x86_64/host/atomic128-ldst.h
+++ b/host/include/x86_64/host/atomic128-ldst.h
@@ -8,8 +8,8 @@
  * atomic primitive is meant to provide.
  */
 
-#ifndef AARCH64_ATOMIC128_LDST_H
-#define AARCH64_ATOMIC128_LDST_H
+#ifndef X86_64_ATOMIC128_LDST_H
+#define X86_64_ATOMIC128_LDST_H
 
 #ifdef CONFIG_INT128_TYPE
 #include "host/cpuinfo.h"
@@ -65,4 +65,4 @@ static inline void atomic16_set(Int128 *ptr, Int128 val)
 #include "host/include/generic/host/atomic128-ldst.h"
 #endif
 
-#endif /* AARCH64_ATOMIC128_LDST_H */
+#endif /* X86_64_ATOMIC128_LDST_H */
-- 
2.30.2


Re: [PATCH] x86_64/atomic128-ldst.h: fix arch include guard
Posted by Richard Henderson 10 months, 3 weeks ago
On 6/20/23 10:39, Frédéric Pétrot wrote:
> Fix arch name in the define that prevents multiple inclusions.
> 
> Signed-off-by: Frédéric Pétrot <frederic.petrot@univ-grenoble-alpes.fr>
> ---
>   host/include/x86_64/host/atomic128-ldst.h | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/host/include/x86_64/host/atomic128-ldst.h b/host/include/x86_64/host/atomic128-ldst.h
> index adc9332f91..d0240d4212 100644
> --- a/host/include/x86_64/host/atomic128-ldst.h
> +++ b/host/include/x86_64/host/atomic128-ldst.h
> @@ -8,8 +8,8 @@
>    * atomic primitive is meant to provide.
>    */
>   
> -#ifndef AARCH64_ATOMIC128_LDST_H
> -#define AARCH64_ATOMIC128_LDST_H
> +#ifndef X86_64_ATOMIC128_LDST_H
> +#define X86_64_ATOMIC128_LDST_H
>   
>   #ifdef CONFIG_INT128_TYPE
>   #include "host/cpuinfo.h"
> @@ -65,4 +65,4 @@ static inline void atomic16_set(Int128 *ptr, Int128 val)
>   #include "host/include/generic/host/atomic128-ldst.h"
>   #endif
>   
> -#endif /* AARCH64_ATOMIC128_LDST_H */
> +#endif /* X86_64_ATOMIC128_LDST_H */

Actually, I recently merged a fix for this: 8a2bd747877.


r~

Re: [PATCH] x86_64/atomic128-ldst.h: fix arch include guard
Posted by Philippe Mathieu-Daudé 10 months, 3 weeks ago
On 20/6/23 10:39, Frédéric Pétrot wrote:
> Fix arch name in the define that prevents multiple inclusions.
> 
> Signed-off-by: Frédéric Pétrot <frederic.petrot@univ-grenoble-alpes.fr>
> ---
>   host/include/x86_64/host/atomic128-ldst.h | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>



Re: [PATCH] x86_64/atomic128-ldst.h: fix arch include guard
Posted by Richard Henderson 10 months, 3 weeks ago
On 6/20/23 10:39, Frédéric Pétrot wrote:
> Fix arch name in the define that prevents multiple inclusions.
> 
> Signed-off-by: Frédéric Pétrot <frederic.petrot@univ-grenoble-alpes.fr>
> ---
>   host/include/x86_64/host/atomic128-ldst.h | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)

Whoopsie.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

> 
> diff --git a/host/include/x86_64/host/atomic128-ldst.h b/host/include/x86_64/host/atomic128-ldst.h
> index adc9332f91..d0240d4212 100644
> --- a/host/include/x86_64/host/atomic128-ldst.h
> +++ b/host/include/x86_64/host/atomic128-ldst.h
> @@ -8,8 +8,8 @@
>    * atomic primitive is meant to provide.
>    */
>   
> -#ifndef AARCH64_ATOMIC128_LDST_H
> -#define AARCH64_ATOMIC128_LDST_H
> +#ifndef X86_64_ATOMIC128_LDST_H
> +#define X86_64_ATOMIC128_LDST_H
>   
>   #ifdef CONFIG_INT128_TYPE
>   #include "host/cpuinfo.h"
> @@ -65,4 +65,4 @@ static inline void atomic16_set(Int128 *ptr, Int128 val)
>   #include "host/include/generic/host/atomic128-ldst.h"
>   #endif
>   
> -#endif /* AARCH64_ATOMIC128_LDST_H */
> +#endif /* X86_64_ATOMIC128_LDST_H */