diff options
| author | Richard Henderson | 2019-03-23 01:41:14 +0100 |
|---|---|---|
| committer | Richard Henderson | 2019-06-10 16:03:34 +0200 |
| commit | 2fc0cc0e1e034582f4718b1a2d57691474ccb6aa (patch) | |
| tree | 8b6d714fe425358fa96c29e9f4abbab0f1f8252a /linux-user/aarch64/cpu_loop.c | |
| parent | target/alpha: Use env_cpu, env_archcpu (diff) | |
| download | qemu-2fc0cc0e1e034582f4718b1a2d57691474ccb6aa.tar.gz qemu-2fc0cc0e1e034582f4718b1a2d57691474ccb6aa.tar.xz qemu-2fc0cc0e1e034582f4718b1a2d57691474ccb6aa.zip | |
target/arm: Use env_cpu, env_archcpu
Cleanup in the boilerplate that each target must define.
Replace arm_env_get_cpu with env_archcpu. The combination
CPU(arm_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 'linux-user/aarch64/cpu_loop.c')
| -rw-r--r-- | linux-user/aarch64/cpu_loop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux-user/aarch64/cpu_loop.c b/linux-user/aarch64/cpu_loop.c index 2f2f63e3e8..18db6f80f0 100644 --- a/linux-user/aarch64/cpu_loop.c +++ b/linux-user/aarch64/cpu_loop.c @@ -73,7 +73,7 @@ /* AArch64 main loop */ void cpu_loop(CPUARMState *env) { - CPUState *cs = CPU(arm_env_get_cpu(env)); + CPUState *cs = env_cpu(env); int trapnr; abi_long ret; target_siginfo_t info; @@ -150,8 +150,8 @@ void cpu_loop(CPUARMState *env) void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs) { - ARMCPU *cpu = arm_env_get_cpu(env); - CPUState *cs = CPU(cpu); + ARMCPU *cpu = env_archcpu(env); + CPUState *cs = env_cpu(env); TaskState *ts = cs->opaque; struct image_info *info = ts->info; int i; |