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/ppc/cpu.h | 2 +- target/ppc/mmu_common.c | 2 +- target/ppc/monitor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index ba17ea83fa2..7fcafd590d4 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -3082,7 +3082,7 @@ static inline bool ppc_interrupts_little_endian(PowerPCCPU *cpu, bool hv) } #endif -void dump_mmu(Monitor *mon, CPUPPCState *env); +void ppc_monitor_dump_mmu(Monitor *mon, CPUPPCState *env); void ppc_maybe_bswap_register(CPUPPCState *env, uint8_t *mem_buf, int len); void ppc_store_vscr(CPUPPCState *env, uint32_t vscr); diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 5ea9b6d6773..00923c0b96e 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -547,7 +547,7 @@ static void mmu6xx_dump_mmu(Monitor *mon, CPUPPCState *env) } } -void dump_mmu(Monitor *mon, CPUPPCState *env) +void ppc_monitor_dump_mmu(Monitor *mon, CPUPPCState *env) { switch (env->mmu_model) { case POWERPC_MMU_BOOKE: diff --git a/target/ppc/monitor.c b/target/ppc/monitor.c index 41337d77a89..f95b1b44c2c 100644 --- a/target/ppc/monitor.c +++ b/target/ppc/monitor.c @@ -19,5 +19,5 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) monitor_printf(mon, "No CPU available\n"); return; } - dump_mmu(mon, env1); + ppc_monitor_dump_mmu(mon, env1); } -- 2.53.0
