diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-09-08 16:44:05 +0100 |
|---|---|---|
| committer | Laurent Vivier <laurent@vivier.eu> | 2021-09-13 20:35:45 +0200 |
| commit | d0a7920eb4fc44dd4485167edf7db7fac1de6977 (patch) | |
| tree | c4bd12a48ae6d0e71ea32ad766048295d7e8ef8c | |
| parent | 85b4fa0cd189311dc1c69714e669b5a12b0552f6 (diff) | |
linux-user: Drop unneeded includes from qemu.h
Trim down the #includes in qemu.h where we can, either by
dropping unneeded headers or by moving them to user-internals.h.
This includes deleting a couple of #includes that appear at
weird points midway through the header file.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20210908154405.15417-10-peter.maydell@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
| -rw-r--r-- | linux-user/qemu.h | 4 | ||||
| -rw-r--r-- | linux-user/user-internals.h | 2 | ||||
| -rw-r--r-- | thunk.c | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index fda90fc28d..5c713fa8ab 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -2,7 +2,6 @@ #define QEMU_H #include "cpu.h" -#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #undef DEBUG_REMAP @@ -163,8 +162,6 @@ typedef struct TaskState { struct target_sigaltstack sigaltstack_used; } __attribute__((aligned(16))) TaskState; -#include "qemu/log.h" - abi_long do_brk(abi_ulong new_brk); /* user access */ @@ -349,5 +346,4 @@ void *lock_user_string(abi_ulong guest_addr); #define unlock_user_struct(host_ptr, guest_addr, copy) \ unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0) -#include <pthread.h> #endif /* QEMU_H */ diff --git a/linux-user/user-internals.h b/linux-user/user-internals.h index 1729a8b62e..661612a088 100644 --- a/linux-user/user-internals.h +++ b/linux-user/user-internals.h @@ -20,6 +20,8 @@ #include "hostdep.h" #include "exec/user/thunk.h" +#include "exec/exec-all.h" +#include "qemu/log.h" extern char *exec_path; void init_task_state(TaskState *ts); @@ -17,6 +17,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ #include "qemu/osdep.h" +#include "qemu/log.h" #include "qemu.h" #include "exec/user/thunk.h" |