aboutsummaryrefslogtreecommitdiff
path: root/target/s390x/sigp.c
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2019-03-22 19:21:48 -0700
committerRichard Henderson <richard.henderson@linaro.org>2019-06-10 07:03:42 -0700
commitdc79e928698567b14e6638c4c9f1e43dc386f1d8 (patch)
tree26b73cb1112ea0cee56cf174b566ccefd6717e95 /target/s390x/sigp.c
parent3109cd98a6c0c618189b38a83a8aa29cb20acbce (diff)
downloadqemu-dc79e928698567b14e6638c4c9f1e43dc386f1d8.zip
qemu-dc79e928698567b14e6638c4c9f1e43dc386f1d8.tar.gz
qemu-dc79e928698567b14e6638c4c9f1e43dc386f1d8.tar.bz2
target/s390x: Use env_cpu, env_archcpu
Cleanup in the boilerplate that each target must define. Replace s390_env_get_cpu with env_archcpu. The combination CPU(s390_env_get_cpu) should have used ENV_GET_CPU to begin; use env_cpu now. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/s390x/sigp.c')
-rw-r--r--target/s390x/sigp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c
index c1f9245..ea5f69d 100644
--- a/target/s390x/sigp.c
+++ b/target/s390x/sigp.c
@@ -454,7 +454,7 @@ int handle_sigp(CPUS390XState *env, uint8_t order, uint64_t r1, uint64_t r3)
{
uint64_t *status_reg = &env->regs[r1];
uint64_t param = (r1 % 2) ? env->regs[r1] : env->regs[r1 + 1];
- S390CPU *cpu = s390_env_get_cpu(env);
+ S390CPU *cpu = env_archcpu(env);
S390CPU *dst_cpu = NULL;
int ret;
@@ -492,7 +492,7 @@ int s390_cpu_restart(S390CPU *cpu)
void do_stop_interrupt(CPUS390XState *env)
{
- S390CPU *cpu = s390_env_get_cpu(env);
+ S390CPU *cpu = env_archcpu(env);
if (s390_cpu_set_state(S390_CPU_STATE_STOPPED, cpu) == 0) {
qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);