[PATCH] exec/user: Move 'abitypes.h' from 'exec/user' to 'user'

[PATCH] exec/user: Move 'abitypes.h' from 'exec/user' to 'user'

[Philippe Mathieu-Daudé]

Keep all user emulation headers under the same user/ directory.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
Forgot to include this patch in "exec: Rework around CPUState user fields"
https://lore.kernel.org/qemu-devel/20240428221450.26460-1-philmd@linaro.org/
---
 bsd-user/qemu.h                    | 2 +-
 include/exec/cpu-all.h             | 2 +-
 include/exec/user/thunk.h          | 2 +-
 include/{exec => }/user/abitypes.h | 4 ++--
 include/user/syscall-trace.h       | 2 +-
 linux-user/qemu.h                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename include/{exec => }/user/abitypes.h (97%)

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 8629f0dcde..a0c1ad7efa 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -22,7 +22,7 @@
 #include "exec/cpu_ldst.h"
 #include "exec/exec-all.h"
 
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 
 extern char **environ;
 
diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index e75ec13cd0..032c6d990e 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -64,7 +64,7 @@
 /* MMU memory access macros */
 
 #if defined(CONFIG_USER_ONLY)
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 
 /*
  * If non-zero, the guest virtual address space is a contiguous subset
diff --git a/include/exec/user/thunk.h b/include/exec/user/thunk.h
index 2ebfecf58e..9f35c888f9 100644
--- a/include/exec/user/thunk.h
+++ b/include/exec/user/thunk.h
@@ -21,7 +21,7 @@
 #define THUNK_H
 
 #include "cpu.h"
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 
 /* types enums definitions */
 
diff --git a/include/exec/user/abitypes.h b/include/user/abitypes.h
similarity index 97%
rename from include/exec/user/abitypes.h
rename to include/user/abitypes.h
index 3ec1969368..5c9a955631 100644
--- a/include/exec/user/abitypes.h
+++ b/include/user/abitypes.h
@@ -1,5 +1,5 @@
-#ifndef EXEC_USER_ABITYPES_H
-#define EXEC_USER_ABITYPES_H
+#ifndef USER_ABITYPES_H
+#define USER_ABITYPES_H
 
 #ifndef CONFIG_USER_ONLY
 #error Cannot include this header from system emulation
diff --git a/include/user/syscall-trace.h b/include/user/syscall-trace.h
index b48b2b2d0a..9bd7ca19c8 100644
--- a/include/user/syscall-trace.h
+++ b/include/user/syscall-trace.h
@@ -10,7 +10,7 @@
 #ifndef SYSCALL_TRACE_H
 #define SYSCALL_TRACE_H
 
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 #include "gdbstub/user.h"
 #include "qemu/plugin.h"
 #include "trace/trace-root.h"
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 4777856b52..263f445ff1 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -4,7 +4,7 @@
 #include "cpu.h"
 #include "exec/cpu_ldst.h"
 
-#include "exec/user/abitypes.h"
+#include "user/abitypes.h"
 
 #include "syscall_defs.h"
 #include "target_syscall.h"
-- 
2.41.0

Re: [PATCH] exec/user: Move 'abitypes.h' from 'exec/user' to 'user'

[Richard Henderson]

On 5/3/24 05:52, Philippe Mathieu-Daudé wrote:
> Keep all user emulation headers under the same user/ directory.
> 
> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org>
> ---
> Forgot to include this patch in "exec: Rework around CPUState user fields"
> https://lore.kernel.org/qemu-devel/20240428221450.26460-1-philmd@linaro.org/
> ---
>   bsd-user/qemu.h                    | 2 +-
>   include/exec/cpu-all.h             | 2 +-
>   include/exec/user/thunk.h          | 2 +-
>   include/{exec => }/user/abitypes.h | 4 ++--
>   include/user/syscall-trace.h       | 2 +-
>   linux-user/qemu.h                  | 2 +-
>   6 files changed, 7 insertions(+), 7 deletions(-)
>   rename include/{exec => }/user/abitypes.h (97%)

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

r~