From: Philippe Mathieu-Daudé <[email protected]> cpu_physical_memory_read() and cpu_physical_memory_write() are legacy (see commit b7ecba0f6f6), replace by address_space_read() and address_space_write() respectively, accessing the per-vCPU address space instead of the global &address_space_memory one.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Richard Henderson <[email protected]> --- target/s390x/diag.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/target/s390x/diag.c b/target/s390x/diag.c index bc1791067d8..01cc802eaed 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -79,7 +79,8 @@ static void s390_ipl_read(CPUS390XState *env, uint64_t addr, if (s390_is_pv()) { s390_cpu_pv_mem_read(env_archcpu(env), 0, iplb, size); } else { - cpu_physical_memory_read(addr, iplb, size); + address_space_read(cpu_get_address_space(env_cpu(env), 0), addr, + MEMTXATTRS_UNSPECIFIED, iplb, size); } } @@ -89,7 +90,8 @@ static void s390_ipl_write(CPUS390XState *env, uint64_t addr, if (s390_is_pv()) { s390_cpu_pv_mem_write(env_archcpu(env), 0, iplb, size); } else { - cpu_physical_memory_write(addr, iplb, size); + address_space_write(cpu_get_address_space(env_cpu(env), 0), addr, + MEMTXATTRS_UNSPECIFIED, iplb, size); } } -- 2.53.0
