| Message ID | 20250424094653.35932-5-philmd@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | include: Remove "exec/exec-all.h" | expand |
On 24/04/2025 10:46, Philippe Mathieu-Daudé wrote: > "exec/exec-all.h" declares prototypes such: > > void *probe_access(CPUArchState *env, vaddr addr, int size, > ^^^^^ > MMUAccessType access_type, int mmu_idx, > uintptr_t retaddr); > MemoryRegionSection *iotlb_to_section(CPUState *cpu, > hwaddr index, > ^^^^^^ > MemTxAttrs attrs); > ^^^^^^^^^^ > > vaddr is defined in "exec/vaddr.h", hwaddr in "exec/hwaddr.h" > and MemTxAttrs in "exec/memattrs.h". All these headers are > indirectly pulled in via "exec/translation-block.h". Since > we will remove "exec/translation-block.h" in the next commit, > include the missing ones, otherwise we'd get errors such: > > include/exec/exec-all.h:51:1: error: unknown type name 'hwaddr' > 51 | hwaddr memory_region_section_get_iotlb(CPUState *cpu, > | ^ > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > include/exec/exec-all.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h > index 24383b6abad..c46255e66ef 100644 > --- a/include/exec/exec-all.h > +++ b/include/exec/exec-all.h > @@ -20,8 +20,11 @@ > #ifndef EXEC_ALL_H > #define EXEC_ALL_H > > +#include "exec/hwaddr.h" > +#include "exec/memattrs.h" > #include "exec/mmu-access-type.h" > #include "exec/translation-block.h" > +#include "exec/vaddr.h" > > #if defined(CONFIG_TCG) > #include "accel/tcg/getpc.h" Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com> ATB, Mark.
diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h index 24383b6abad..c46255e66ef 100644 --- a/include/exec/exec-all.h +++ b/include/exec/exec-all.h @@ -20,8 +20,11 @@ #ifndef EXEC_ALL_H #define EXEC_ALL_H +#include "exec/hwaddr.h" +#include "exec/memattrs.h" #include "exec/mmu-access-type.h" #include "exec/translation-block.h" +#include "exec/vaddr.h" #if defined(CONFIG_TCG) #include "accel/tcg/getpc.h"
"exec/exec-all.h" declares prototypes such: void *probe_access(CPUArchState *env, vaddr addr, int size, ^^^^^ MMUAccessType access_type, int mmu_idx, uintptr_t retaddr); MemoryRegionSection *iotlb_to_section(CPUState *cpu, hwaddr index, ^^^^^^ MemTxAttrs attrs); ^^^^^^^^^^ vaddr is defined in "exec/vaddr.h", hwaddr in "exec/hwaddr.h" and MemTxAttrs in "exec/memattrs.h". All these headers are indirectly pulled in via "exec/translation-block.h". Since we will remove "exec/translation-block.h" in the next commit, include the missing ones, otherwise we'd get errors such: include/exec/exec-all.h:51:1: error: unknown type name 'hwaddr' 51 | hwaddr memory_region_section_get_iotlb(CPUState *cpu, | ^ Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/exec/exec-all.h | 3 +++ 1 file changed, 3 insertions(+)