diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-09-29 15:28:06 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-10-07 03:37:04 +0200 |
| commit | 1e440937d699514207946c36c353a7a616f8b805 (patch) | |
| tree | 91983e8096da7094b4bf3d2c0fb6eb2f069987f0 | |
| parent | 6ffaa9219616d12bc6c3e7cb26a77f7432ac0c70 (diff) | |
| download | focaccia-qemu-1e440937d699514207946c36c353a7a616f8b805.tar.gz focaccia-qemu-1e440937d699514207946c36c353a7a616f8b805.zip | |
hw/s390x/sclp: Use address_space_memory_is_io() in sclp_service_call()
When cpu_address_space_init() isn't called during vCPU creation, its single address space is the global &address_space_memory. As s390x boards don't call cpu_address_space_init(), cpu->as points to &address_space_memory. We can then replace cpu_physical_memory_is_io() by the semantically equivalent address_space_memory_is_io() call. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Eric Farman <farman@linux.ibm.com> Message-Id: <20251002084203.63899-5-philmd@linaro.org>
| -rw-r--r-- | hw/s390x/sclp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c index 9718564fa4..16057356b1 100644 --- a/hw/s390x/sclp.c +++ b/hw/s390x/sclp.c @@ -16,6 +16,7 @@ #include "qemu/units.h" #include "qapi/error.h" #include "hw/boards.h" +#include "system/memory.h" #include "hw/s390x/sclp.h" #include "hw/s390x/event-facility.h" #include "hw/s390x/s390-pci-bus.h" @@ -308,7 +309,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code) if (env->psw.mask & PSW_MASK_PSTATE) { return -PGM_PRIVILEGED; } - if (cpu_physical_memory_is_io(sccb)) { + if (address_space_is_io(CPU(cpu)->as, sccb)) { return -PGM_ADDRESSING; } if ((sccb & ~0x1fffUL) == 0 || (sccb & ~0x1fffUL) == env->psa |