user: Move 'abitypes.h' from 'exec/user' to 'user'

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

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240503125202.35667-1-philmd@linaro.org>

diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 8629f0dcde9142fa81f435fc9584c8732c0ff806..a0c1ad7efaf9d01e285f3cc0f9ea521d0f88329a 100644 (file)
--- 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 e75ec13cd0283311d08c7b52b49b9dd328c48202..032c6d990e18a3c0bb78f36b21d11690e7bd7a9d 100644 (file)
--- 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 2ebfecf58eb2f62da322a595ea79f7c951565b96..9f35c888f9277c19de0f13a51b000d7e47cd29b1 100644 (file)
--- 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 3ec1969368743e38e7f23e08e9b6773886920c34..5c9a95563157d9f31e8425d311daecb9b1b319c0 100644 (file)
--- 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 b48b2b2d0aef5a55d950af1b94f1d20fd556820b..9bd7ca19c846511b76a1ef682d3c041a69edbcef 100644 (file)
--- 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 4777856b529d758828225b9ded15b8aa8bc043a5..263f445ff1f3f67bc1d1363a1db76245ca494d79 100644 (file)
--- 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"