diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2023-09-25 12:22:19 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2023-10-19 14:32:13 +0100 |
| commit | 30722e0445908d3cf2d366d7bee69d0ae57401be (patch) | |
| tree | 7a6ddeb3d4f9a3c6bf16f30806cb0c6f4cc2c0ce | |
| parent | 4fd79a96ea9149a7ea8fba5c0ea74ff5f9f02139 (diff) | |
| download | qemu-30722e0445908d3cf2d366d7bee69d0ae57401be.zip qemu-30722e0445908d3cf2d366d7bee69d0ae57401be.tar.gz qemu-30722e0445908d3cf2d366d7bee69d0ae57401be.tar.bz2 | |
target/arm/common-semi-target.h: Remove unnecessary boot.h include
The hw/arm/boot.h include in common-semi-target.h is not actually
needed, and it's a bit odd because it pulls a hw/arm header into a
target/arm file.
This include was originally needed because the semihosting code used
the arm_boot_info struct to get the base address of the RAM in system
emulation, to use in a (bad) heuristic for the return values for the
SYS_HEAPINFO semihosting call. We've since overhauled how we
calculate the HEAPINFO values in system emulation, and the code no
longer uses the arm_boot_info struct.
Remove the now-redundant include line, and instead directly include
the cpu-qom.h header that we were previously getting via boot.h.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230925112219.3919261-1-peter.maydell@linaro.org
| -rw-r--r-- | target/arm/common-semi-target.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/target/arm/common-semi-target.h b/target/arm/common-semi-target.h index 19438ed..da51f2d 100644 --- a/target/arm/common-semi-target.h +++ b/target/arm/common-semi-target.h @@ -10,9 +10,7 @@ #ifndef TARGET_ARM_COMMON_SEMI_TARGET_H #define TARGET_ARM_COMMON_SEMI_TARGET_H -#ifndef CONFIG_USER_ONLY -#include "hw/arm/boot.h" -#endif +#include "target/arm/cpu-qom.h" static inline target_ulong common_semi_arg(CPUState *cs, int argno) { |