Skip to content

Commit

Permalink
target/arm/common-semi-target.h: Remove unnecessary boot.h include
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pm215 committed Oct 19, 2023
1 parent 4fd79a9 commit 30722e0
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions target/arm/common-semi-target.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 30722e0

Please sign in to comment.