aboutsummaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2021-09-08 16:44:04 +0100
committerLaurent Vivier <laurent@vivier.eu>2021-09-13 20:35:45 +0200
commit85b4fa0cd189311dc1c69714e669b5a12b0552f6 (patch)
treee10a886109a18acb3005d0415b01e63808ecda5a /linux-user
parent3b249d2661c752e75ef6d2d4ac63bdf9a921dd4b (diff)
downloadqemu-85b4fa0cd189311dc1c69714e669b5a12b0552f6.zip
qemu-85b4fa0cd189311dc1c69714e669b5a12b0552f6.tar.gz
qemu-85b4fa0cd189311dc1c69714e669b5a12b0552f6.tar.bz2
linux-user: Don't include gdbstub.h in qemu.h
Currently the linux-user qemu.h pulls in gdbstub.h. There's no real reason why it should do this; include it directly from the C files which require it, and drop the include line in qemu.h. (Note that several of the C files previously relying on this indirect include were going out of their way to only include gdbstub.h conditionally on not CONFIG_USER_ONLY!) 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-9-peter.maydell@linaro.org> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/exit.c1
-rw-r--r--linux-user/main.c1
-rw-r--r--linux-user/qemu.h1
-rw-r--r--linux-user/signal.c2
4 files changed, 4 insertions, 1 deletions
diff --git a/linux-user/exit.c b/linux-user/exit.c
index 68a3a6f..fa6ef0b 100644
--- a/linux-user/exit.c
+++ b/linux-user/exit.c
@@ -17,6 +17,7 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "qemu/osdep.h"
+#include "exec/gdbstub.h"
#include "qemu.h"
#include "user-internals.h"
#ifdef CONFIG_GPROF
diff --git a/linux-user/main.c b/linux-user/main.c
index 9edc0b2..5ce17e4 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -40,6 +40,7 @@
#include "qemu/module.h"
#include "qemu/plugin.h"
#include "exec/exec-all.h"
+#include "exec/gdbstub.h"
#include "tcg/tcg.h"
#include "qemu/timer.h"
#include "qemu/envlist.h"
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 92290a5..fda90fc 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -11,7 +11,6 @@
#include "syscall_defs.h"
#include "target_syscall.h"
-#include "exec/gdbstub.h"
/*
* This is the size of the host kernel's sigset_t, needed where we make
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 6af6612..f8346f5 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -18,6 +18,8 @@
*/
#include "qemu/osdep.h"
#include "qemu/bitops.h"
+#include "exec/gdbstub.h"
+
#include <sys/ucontext.h>
#include <sys/resource.h>