diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-01-16 16:02:35 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2025-01-17 10:44:00 +0000 |
| commit | 57792106562417ba03a1ac0f2a5afc3eb63c5d9e (patch) | |
| tree | d9d23001375032efd81df9e85fa8db0e7a6bb2b5 | |
| parent | 847343cfbf80bd221f42595a0038a8d5e7ab7088 (diff) | |
| download | qemu-57792106562417ba03a1ac0f2a5afc3eb63c5d9e.zip qemu-57792106562417ba03a1ac0f2a5afc3eb63c5d9e.tar.gz qemu-57792106562417ba03a1ac0f2a5afc3eb63c5d9e.tar.bz2 | |
semihosting/console: Avoid including 'cpu.h'
The CPUState structure is declared in "hw/core/cpu.h",
the EXCP_HALTED definition in "exec/cpu-common.h".
Both headers are indirectly include by "cpu.h". In
order to remove "cpu.h" from "semihosting/console.h",
explicitly include them in console.c, otherwise we'd
get:
../semihosting/console.c:88:11: error: incomplete definition of type 'struct CPUState'
88 | cs->exception_index = EXCP_HALTED;
| ~~^
../semihosting/console.c:88:31: error: use of undeclared identifier 'EXCP_HALTED'
88 | cs->exception_index = EXCP_HALTED;
| ^
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250103171037.11265-5-philmd@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20250116160306.1709518-7-alex.bennee@linaro.org>
| -rw-r--r-- | include/semihosting/console.h | 2 | ||||
| -rw-r--r-- | semihosting/console.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/semihosting/console.h b/include/semihosting/console.h index bd78e5f..1c12e17 100644 --- a/include/semihosting/console.h +++ b/include/semihosting/console.h @@ -9,8 +9,6 @@ #ifndef SEMIHOST_CONSOLE_H #define SEMIHOST_CONSOLE_H -#include "cpu.h" - /** * qemu_semihosting_console_read: * @cs: CPUState diff --git a/semihosting/console.c b/semihosting/console.c index 60102bb..c3683a1 100644 --- a/semihosting/console.c +++ b/semihosting/console.c @@ -18,14 +18,15 @@ #include "qemu/osdep.h" #include "semihosting/semihost.h" #include "semihosting/console.h" +#include "exec/cpu-common.h" #include "exec/gdbstub.h" -#include "exec/exec-all.h" #include "qemu/log.h" #include "chardev/char.h" #include "chardev/char-fe.h" #include "qemu/main-loop.h" #include "qapi/error.h" #include "qemu/fifo8.h" +#include "hw/core/cpu.h" /* Access to this structure is protected by the BQL */ typedef struct SemihostingConsole { |