Rename dump_mmu() to avoid a name clash with other targets: $ git grep -w dump_mmu master | fgrep .h target/m68k/cpu.h:610:void dump_mmu(CPUM68KState *env); target/ppc/cpu.h:3083:void dump_mmu(CPUPPCState *env); target/sparc/cpu.h:603:void dump_mmu(CPUSPARCState *env); target/xtensa/cpu.h:697:void dump_mmu(CPUXtensaState *env);
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- target/xtensa/cpu.h | 2 +- target/xtensa/mmu_helper.c | 2 +- target/xtensa/monitor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index caec22bb742..095b4ced45f 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -693,7 +693,7 @@ int xtensa_get_physical_addr(CPUXtensaState *env, bool update_tlb, uint32_t vaddr, int is_write, int mmu_idx, uint32_t *paddr, uint32_t *page_size, unsigned *access); void reset_mmu(CPUXtensaState *env); -void dump_mmu(Monitor *mon, CPUXtensaState *env); +void xtensa_monitor_dump_mmu(Monitor *mon, CPUXtensaState *env); static inline MemoryRegion *xtensa_get_er_region(CPUXtensaState *env) { diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index 48e1d64a3d7..766fe60e2eb 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -1198,7 +1198,7 @@ static void dump_mpu(Monitor *mon, CPUXtensaState *env, } } -void dump_mmu(Monitor *mon, CPUXtensaState *env) +void xtensa_monitor_dump_mmu(Monitor *mon, CPUXtensaState *env) { if (xtensa_option_bits_enabled(env->config, XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_PROTECTION) | diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c index 2761735f112..80ebba5acbd 100644 --- a/target/xtensa/monitor.c +++ b/target/xtensa/monitor.c @@ -34,5 +34,5 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) monitor_printf(mon, "No CPU available\n"); return; } - dump_mmu(mon, env1); + xtensa_monitor_dump_mmu(mon, env1); } -- 2.53.0
