[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 08/10] linux-user: Don't include gdbstub.h in qemu.h
From: |
Peter Maydell |
Subject: |
[PATCH for-6.2 08/10] linux-user: Don't include gdbstub.h in qemu.h |
Date: |
Sun, 18 Jul 2021 00:21:01 +0100 |
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>
---
linux-user/qemu.h | 1 -
gdbstub.c | 2 +-
linux-user/exit.c | 1 +
linux-user/main.c | 1 +
linux-user/signal.c | 2 ++
semihosting/arm-compat-semi.c | 2 +-
target/m68k/m68k-semi.c | 2 +-
target/nios2/nios2-semi.c | 2 +-
8 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 92290a55c0d..fda90fc28d6 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/gdbstub.c b/gdbstub.c
index 52bde5bdc97..480745152b8 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -31,13 +31,13 @@
#include "qemu/cutils.h"
#include "qemu/module.h"
#include "trace/trace-root.h"
+#include "exec/gdbstub.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#else
#include "monitor/monitor.h"
#include "chardev/char.h"
#include "chardev/char-fe.h"
-#include "exec/gdbstub.h"
#include "hw/cpu/cluster.h"
#include "hw/boards.h"
#endif
diff --git a/linux-user/exit.c b/linux-user/exit.c
index 371a0803ece..9f78be5feda 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 21fe674de3d..8157a208efc 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/signal.c b/linux-user/signal.c
index 7c14f17fb2c..ca2f585b082 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>
diff --git a/semihosting/arm-compat-semi.c b/semihosting/arm-compat-semi.c
index 1c29146dcfa..01badea99c8 100644
--- a/semihosting/arm-compat-semi.c
+++ b/semihosting/arm-compat-semi.c
@@ -37,12 +37,12 @@
#include "semihosting/console.h"
#include "semihosting/common-semi.h"
#include "qemu/timer.h"
+#include "exec/gdbstub.h"
#ifdef CONFIG_USER_ONLY
#include "qemu.h"
#define COMMON_SEMI_HEAP_SIZE (128 * 1024 * 1024)
#else
-#include "exec/gdbstub.h"
#include "qemu/cutils.h"
#ifdef TARGET_ARM
#include "hw/arm/boot.h"
diff --git a/target/m68k/m68k-semi.c b/target/m68k/m68k-semi.c
index d919245e4f8..44ec7e4612c 100644
--- a/target/m68k/m68k-semi.c
+++ b/target/m68k/m68k-semi.c
@@ -20,11 +20,11 @@
#include "qemu/osdep.h"
#include "cpu.h"
+#include "exec/gdbstub.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#define SEMIHOSTING_HEAP_SIZE (128 * 1024 * 1024)
#else
-#include "exec/gdbstub.h"
#include "exec/softmmu-semi.h"
#include "hw/boards.h"
#endif
diff --git a/target/nios2/nios2-semi.c b/target/nios2/nios2-semi.c
index e508b2fafce..fe5598bae4d 100644
--- a/target/nios2/nios2-semi.c
+++ b/target/nios2/nios2-semi.c
@@ -24,11 +24,11 @@
#include "qemu/osdep.h"
#include "cpu.h"
+#include "exec/gdbstub.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#else
#include "qemu-common.h"
-#include "exec/gdbstub.h"
#include "exec/softmmu-semi.h"
#endif
#include "qemu/log.h"
--
2.20.1
- Re: [PATCH for-6.2 02/10] linux-user: Split strace prototypes into strace.h, (continued)
- [PATCH for-6.2 01/10] linux-user: Fix coding style nits in qemu.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 03/10] linux-user: Split signal-related prototypes into sighandling.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 05/10] linux-user: Split mmap prototypes into user-mmap.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 04/10] linux-user: Split loader-related prototypes into loader.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 06/10] linux-user: Split safe-syscall macro into its own header, Peter Maydell, 2021/07/17
- [PATCH for-6.2 08/10] linux-user: Don't include gdbstub.h in qemu.h,
Peter Maydell <=
- [PATCH for-6.2 10/10] linux-user: Move DEBUG_REMAP undef to uaccess.c, Peter Maydell, 2021/07/17
- [PATCH for-6.2 07/10] linux-user: Split linux-user internals out of qemu.h, Peter Maydell, 2021/07/17
- [PATCH for-6.2 09/10] linux-user: Drop unneeded includes from qemu.h, Peter Maydell, 2021/07/17