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/m68k/cpu.h | 2 +- target/m68k/helper.c | 2 +- target/m68k/monitor.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 84ffebe3890..5c45597375c 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -606,6 +606,6 @@ void m68k_cpu_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, #define TB_FLAGS_TRACE 16 #define TB_FLAGS_TRACE_BIT (1 << TB_FLAGS_TRACE) -void dump_mmu(Monitor *mon, CPUM68KState *env); +void m68k_monitor_dump_mmu(Monitor *mon, CPUM68KState *env); #endif diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 2208b9a2ab9..7cdea555061 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -611,7 +611,7 @@ static void dump_ttr(Monitor *mon, uint32_t ttr) M68K_DESC_USERATTR_SHIFT); } -void dump_mmu(Monitor *mon, CPUM68KState *env) +void m68k_monitor_dump_mmu(Monitor *mon, CPUM68KState *env) { if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { monitor_puts(mon, "Translation disabled\n"); diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 38f925e5b16..eea5ae16a90 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -19,7 +19,7 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) return; } - dump_mmu(mon, env1); + m68k_monitor_dump_mmu(mon, env1); } static const MonitorDef monitor_defs[] = { -- 2.53.0
