diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2019-03-22 16:07:18 -0700 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2019-06-10 07:03:34 -0700 |
| commit | 29a0af618ddd21f55df5753c3e16b0625f534b3c (patch) | |
| tree | 18b00b62ec94b2c90d4f0594b1bbc8c992a3b777 /target/i386/hax-all.c | |
| parent | 2161a612b4e1d388046320bc464adefd6bba01a0 (diff) | |
| download | qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.zip qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.tar.gz qemu-29a0af618ddd21f55df5753c3e16b0625f534b3c.tar.bz2 | |
cpu: Replace ENV_GET_CPU with env_cpu
Now that we have both ArchCPU and CPUArchState, we can define
this generically instead of via macro in each target's cpu.h.
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/i386/hax-all.c')
| -rw-r--r-- | target/i386/hax-all.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/i386/hax-all.c b/target/i386/hax-all.c index 44b89c1..64fd51a 100644 --- a/target/i386/hax-all.c +++ b/target/i386/hax-all.c @@ -67,7 +67,7 @@ int valid_hax_tunnel_size(uint16_t size) hax_fd hax_vcpu_get_fd(CPUArchState *env) { - struct hax_vcpu_state *vcpu = ENV_GET_CPU(env)->hax_vcpu; + struct hax_vcpu_state *vcpu = env_cpu(env)->hax_vcpu; if (!vcpu) { return HAX_INVALID_FD; } @@ -409,7 +409,7 @@ static int hax_handle_io(CPUArchState *env, uint32_t df, uint16_t port, static int hax_vcpu_interrupt(CPUArchState *env) { - CPUState *cpu = ENV_GET_CPU(env); + CPUState *cpu = env_cpu(env); struct hax_vcpu_state *vcpu = cpu->hax_vcpu; struct hax_tunnel *ht = vcpu->tunnel; @@ -461,7 +461,7 @@ void hax_raise_event(CPUState *cpu) static int hax_vcpu_hax_exec(CPUArchState *env) { int ret = 0; - CPUState *cpu = ENV_GET_CPU(env); + CPUState *cpu = env_cpu(env); X86CPU *x86_cpu = X86_CPU(cpu); struct hax_vcpu_state *vcpu = cpu->hax_vcpu; struct hax_tunnel *ht = vcpu->tunnel; |