diff options
author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-03-22 11:10:04 +0100 |
---|---|---|
committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-05-03 17:21:18 +0200 |
commit | 22879b66800d4f84ff48f151867369e76e33f9a4 (patch) | |
tree | cdb2217fb3e38ccd7f5403fdcda76d08f5231e4e | |
parent | f184f3856e82a6f4e96df6a77118d6a2e1a9059b (diff) | |
download | qemu-22879b66800d4f84ff48f151867369e76e33f9a4.zip qemu-22879b66800d4f84ff48f151867369e76e33f9a4.tar.gz qemu-22879b66800d4f84ff48f151867369e76e33f9a4.tar.bz2 |
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>
-rw-r--r-- | bsd-user/qemu.h | 2 | ||||
-rw-r--r-- | include/exec/cpu-all.h | 2 | ||||
-rw-r--r-- | include/exec/user/thunk.h | 2 | ||||
-rw-r--r-- | include/user/abitypes.h (renamed from include/exec/user/abitypes.h) | 4 | ||||
-rw-r--r-- | include/user/syscall-trace.h | 2 | ||||
-rw-r--r-- | linux-user/qemu.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 8629f0d..a0c1ad7 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 e75ec13..032c6d9 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 2ebfecf..9f35c88 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 index 3ec1969..5c9a955 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 b48b2b2..9bd7ca1 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 4777856..263f445 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" |