openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Peter Maydell 2021-09-08 16:44:05 +01:00 committed by Laurent Vivier
parent 85b4fa0cd1
commit d0a7920eb4
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
linux-user/qemu.h
View File

@ -2,7 +2,6 @@
#define QEMU_H #define QEMU_H
#include "cpu.h" #include "cpu.h"
#include "exec/exec-all.h"
#include "exec/cpu_ldst.h" #include "exec/cpu_ldst.h"
#undef DEBUG_REMAP #undef DEBUG_REMAP
@ -163,8 +162,6 @@ typedef struct TaskState {
struct target_sigaltstack sigaltstack_used; struct target_sigaltstack sigaltstack_used;
} __attribute__((aligned(16))) TaskState; } __attribute__((aligned(16))) TaskState;
#include "qemu/log.h"
abi_long do_brk(abi_ulong new_brk); abi_long do_brk(abi_ulong new_brk);
/* user access */ /* user access */
@ -349,5 +346,4 @@ void *lock_user_string(abi_ulong guest_addr);
#define unlock_user_struct(host_ptr, guest_addr, copy) \ #define unlock_user_struct(host_ptr, guest_addr, copy) \
unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0) unlock_user(host_ptr, guest_addr, (copy) ? sizeof(*host_ptr) : 0)
#include <pthread.h>
#endif /* QEMU_H */ #endif /* QEMU_H */

2
linux-user/user-internals.h
View File

@ -20,6 +20,8 @@
#include "hostdep.h" #include "hostdep.h"
#include "exec/user/thunk.h" #include "exec/user/thunk.h"
#include "exec/exec-all.h"
#include "qemu/log.h"
extern char *exec_path; extern char *exec_path;
void init_task_state(TaskState *ts); void init_task_state(TaskState *ts);

1
thunk.c
View File

@ -17,6 +17,7 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>. * License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/log.h"
#include "qemu.h" #include "qemu.h"
#include "exec/user/thunk.h" #include "exec/user/thunk.h"