On 02/05/2024 12:49 pm, Roger Pau Monne wrote:
> diff --git a/tools/include/xen-tools/common-macros.h
> b/tools/include/xen-tools/common-macros.h
> index 07aed92684b5..3e6a66080a4f 100644
> --- a/tools/include/xen-tools/common-macros.h
> +++ b/tools/include/xen-tools/common-macros.h
> @@ -83,6 +83,10 @@
> #define __packed __attribute__((__packed__))
> #endif
>
> +#ifndef __maybe_unused
> +# define __maybe_unused __attribute__((__unused__))
> +#endif
> +
> #define container_of(ptr, type, member) ({ \
> typeof(((type *)0)->member) *mptr__ = (ptr); \
> (type *)((char *)mptr__ - offsetof(type, member)); \
This hunk needs a matching:
diff --git a/tools/tests/x86_emulator/x86-emulate.h
b/tools/tests/x86_emulator/x86-emulate.h
index 8f8accfe3e70..a702c9faf207 100644
--- a/tools/tests/x86_emulator/x86-emulate.h
+++ b/tools/tests/x86_emulator/x86-emulate.h
@@ -50,7 +50,6 @@
#define this_cpu(var) per_cpu_##var
#define __init
-#define __maybe_unused __attribute__((__unused__))
#define likely(x) __builtin_expect(!!(x), true)
#define unlikely(x) __builtin_expect(!!(x), false)
~Andrew
