Skip to content

Commit 3b249d2

Browse files
pm215vivier
authored andcommitted
linux-user: Split linux-user internals out of qemu.h
qemu.h is included in various non-linux-user files (which mostly want the TaskState struct and the functions for doing usermode access to guest addresses like lock_user(), unlock_user(), get_user*(), etc). Split out the parts that are only used in linux-user itself into a new user-internals.h. This leaves qemu.h with basically three things: * the definition of the TaskState struct * the user-access functions and macros * do_brk() all of which are needed by code outside linux-user that includes qemu.h. The addition of all the extra #include lines was done with sed -i '/include.*qemu\.h/a #include "user-internals.h"' $(git grep -l 'include.*qemu\.h' linux-user) (and then undoing the change to fpa11.h). Signed-off-by: Peter Maydell <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Message-Id: <[email protected]> Signed-off-by: Laurent Vivier <[email protected]>
1 parent a57e0c3 commit 3b249d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+235
-163
lines changed

linux-user/aarch64/cpu_loop.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "qemu/osdep.h"
2121
#include "qemu-common.h"
2222
#include "qemu.h"
23+
#include "user-internals.h"
2324
#include "cpu_loop-common.h"
2425
#include "signal-common.h"
2526
#include "qemu/guest-random.h"

linux-user/aarch64/signal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
#include "qemu/osdep.h"
2020
#include "qemu.h"
21+
#include "user-internals.h"
2122
#include "signal-common.h"
2223
#include "linux-user/trace.h"
2324

linux-user/alpha/cpu_loop.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "qemu/osdep.h"
2121
#include "qemu-common.h"
2222
#include "qemu.h"
23+
#include "user-internals.h"
2324
#include "cpu_loop-common.h"
2425
#include "signal-common.h"
2526

linux-user/alpha/signal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
#include "qemu/osdep.h"
2020
#include "qemu.h"
21+
#include "user-internals.h"
2122
#include "signal-common.h"
2223
#include "linux-user/trace.h"
2324

linux-user/arm/cpu_loop.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "qemu/osdep.h"
2121
#include "qemu-common.h"
2222
#include "qemu.h"
23+
#include "user-internals.h"
2324
#include "elf.h"
2425
#include "cpu_loop-common.h"
2526
#include "signal-common.h"

linux-user/arm/signal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
#include "qemu/osdep.h"
2020
#include "qemu.h"
21+
#include "user-internals.h"
2122
#include "signal-common.h"
2223
#include "linux-user/trace.h"
2324

linux-user/cris/cpu_loop.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "qemu/osdep.h"
2121
#include "qemu-common.h"
2222
#include "qemu.h"
23+
#include "user-internals.h"
2324
#include "cpu_loop-common.h"
2425
#include "signal-common.h"
2526

linux-user/cris/signal.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
#include "qemu/osdep.h"
2020
#include "qemu.h"
21+
#include "user-internals.h"
2122
#include "signal-common.h"
2223
#include "linux-user/trace.h"
2324

linux-user/elfload.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <sys/shm.h>
77

88
#include "qemu.h"
9+
#include "user-internals.h"
910
#include "loader.h"
1011
#include "user-mmap.h"
1112
#include "disas/disas.h"

linux-user/exit.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
#include "qemu/osdep.h"
2020
#include "qemu.h"
21+
#include "user-internals.h"
2122
#ifdef CONFIG_GPROF
2223
#include <sys/gmon.h>
2324
#endif

0 commit comments

Comments
 (0)