From: Peter Maydell <[email protected]> We want to remove the cpu_get_phys_addr_debug() function; update the xtensa boards to use cpu_translate_for_debug() instead.
Signed-off-by: Peter Maydell <[email protected]> Reviewed-by: Richard Henderson <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Message-ID: <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- hw/xtensa/sim.c | 6 +++++- hw/xtensa/xtfpga.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index 32eb16442f0..835cd04fe01 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -40,8 +40,12 @@ static uint64_t translate_phys_addr(void *opaque, uint64_t addr) { XtensaCPU *cpu = opaque; + TranslateForDebugResult tres; - return cpu_get_phys_addr_debug(CPU(cpu), addr); + if (!cpu_translate_for_debug(CPU(cpu), addr, &tres)) { + return -1; + } + return tres.physaddr; } static void sim_reset(void *opaque) diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c index 256497e162d..33a2d9485cf 100644 --- a/hw/xtensa/xtfpga.c +++ b/hw/xtensa/xtfpga.c @@ -191,8 +191,12 @@ static PFlashCFI01 *xtfpga_flash_init(MemoryRegion *address_space, static uint64_t translate_phys_addr(void *opaque, uint64_t addr) { XtensaCPU *cpu = opaque; + TranslateForDebugResult tres; - return cpu_get_phys_addr_debug(CPU(cpu), addr); + if (!cpu_translate_for_debug(CPU(cpu), addr, &tres)) { + return -1; + } + return tres.physaddr; } static void xtfpga_reset(void *opaque) -- 2.53.0
