accel|target: Remove pointless CPUArchState casts
cover accel|target: Remove pointless CPUArchState casts
From: Philippe Mathieu-Daudé <[email protected]>
Now than we can use the abstract CPUArchState, let's clean up.
Based-on: <[email protected]>
target: Use ArchCPU & CPUArchState as abstract interface to target CPU
Philippe Mathieu-Daudé (2):
accel/tcg: Remove pointless CPUArchState casts target/i386: Remove pointless CPUArchState casts
accel/tcg/cpu-exec.c | 4 ++-- target/i386/hax/hax-all.c | 4 ++-- target/i386/nvmm/nvmm-all.c | 14 +++++++------- target/i386/whpx/whpx-all.c | 18 +++++++++--------- 4 files changed, 20 insertions(+), 20 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 accel/tcg: Remove pointless CPUArchState casts
From: Philippe Mathieu-Daudé <[email protected]>
--- accel/tcg/cpu-exec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
accel/tcg/cpu-exec.c +2 -2
@@ -422,7 +422,7 @@ static void cpu_exec_exit(CPUState *cpu)void cpu_exec_step_atomic (CPUState *cpu) { -CPUArchState *env = (CPUArchState *)cpu->env_ptr; +CPUArchState *env = cpu->env_ptr;TranslationBlock *tb;target_ulong cs_base, pc;uint32_t flags, cflags;
@@ -532,7 +532,7 @@ TranslationBlock *tb_htable_lookup(CPUState *cpu, target_ulong pc,struct tb_desc desc;uint32_t h; - desc.env = (CPUArchState *)cpu->env_ptr; + desc.env = cpu->env_ptr; desc.cs_base = cs_base; desc.flags = flags; desc.cflags = cflags;
Signature · 1 line
2.34.1
PATCH 2/2 target/i386: Remove pointless CPUArchState casts
In reply to Philippe Mathieu-DaudéFrom: Philippe Mathieu-Daudé <[email protected]>
--- target/i386/hax/hax-all.c | 4 ++-- target/i386/nvmm/nvmm-all.c | 14 +++++++------- target/i386/whpx/whpx-all.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-)
target/i386/hax/hax-all.c +2 -2
@@ -222,7 +222,7 @@ int hax_init_vcpu(CPUState *cpu) cpu->hax_vcpu = hax_global.vm->vcpus[cpu->cpu_index]; cpu->vcpu_dirty = true; -qemu_register_reset (hax_reset_vcpu_state, (CPUArchState *) (cpu->env_ptr)); +qemu_register_reset (hax_reset_vcpu_state, cpu->env_ptr);return ret; }
@@ -669,7 +669,7 @@ void hax_cpu_synchronize_pre_loadvm(CPUState *cpu)int hax_smp_cpu_exec (CPUState *cpu) { -CPUArchState *env = (CPUArchState *) (cpu->env_ptr); +CPUArchState *env = cpu->env_ptr;int fatal;int ret;
target/i386/nvmm/nvmm-all.c +7 -7
@@ -85,7 +85,7 @@ nvmm_set_segment(struct nvmm_x64_state_seg *nseg, const SegmentCache *qseg)static void nvmm_set_registers (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)cpu->env_ptr; +CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach ();struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;
@@ -222,7 +222,7 @@ nvmm_get_segment(SegmentCache *qseg, const struct nvmm_x64_state_seg *nseg)static void nvmm_get_registers (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)cpu->env_ptr; +CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach ();struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;
@@ -347,7 +347,7 @@ nvmm_get_registers(CPUState *cpu)static bool nvmm_can_take_int (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)cpu->env_ptr; +CPUX86State *env = cpu->env_ptr;struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;struct nvmm_machine *mach =get_nvmm_mach ();
@@ -394,7 +394,7 @@ nvmm_can_take_nmi(CPUState *cpu)static void nvmm_vcpu_pre_run (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)cpu->env_ptr; +CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach ();struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;
@@ -480,7 +480,7 @@ static void nvmm_vcpu_post_run(CPUState *cpu, struct nvmm_vcpu_exit *exit) {struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu); -CPUX86State *env = (CPUArchState *)cpu->env_ptr; +CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);uint64_t tpr;
@@ -652,7 +652,7 @@ static int nvmm_handle_halted(struct nvmm_machine *mach, CPUState *cpu, struct nvmm_vcpu_exit *exit) { - CPUX86State *env = (CPUArchState *)cpu->env_ptr; + CPUX86State *env = cpu->env_ptr;int ret =0 ;qemu_mutex_lock_iothread ();
@@ -685,7 +685,7 @@ nvmm_inject_ud(struct nvmm_machine *mach, struct nvmm_vcpu *vcpu)static int nvmm_vcpu_loop (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)cpu->env_ptr; +CPUX86State *env = cpu->env_ptr;struct nvmm_machine *mach =get_nvmm_mach ();struct qemu_vcpu *qcpu =get_qemu_vcpu (cpu);struct nvmm_vcpu *vcpu = &qcpu->vcpu;
target/i386/whpx/whpx-all.c +9 -9
@@ -221,7 +221,7 @@ static SegmentCache whpx_seg_h2q(const WHV_X64_SEGMENT_REGISTER *hs)static int whpx_set_tsc (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;WHV_REGISTER_NAME tsc_reg = WHvX64RegisterTsc;WHV_REGISTER_VALUE tsc_val;HRESULT hr;
@@ -260,7 +260,7 @@ static void whpx_set_registers(CPUState *cpu, int level) {struct whpx_state *whpx = &whpx_global;struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);struct whpx_register_set vcxt;HRESULT hr;
@@ -428,7 +428,7 @@ static void whpx_set_registers(CPUState *cpu, int level)static int whpx_get_tsc (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;WHV_REGISTER_NAME tsc_reg = WHvX64RegisterTsc;WHV_REGISTER_VALUE tsc_val;HRESULT hr;
@@ -449,7 +449,7 @@ static void whpx_get_registers(CPUState *cpu) {struct whpx_state *whpx = &whpx_global;struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);struct whpx_register_set vcxt;uint64_t tpr, apic_base;
@@ -760,7 +760,7 @@ static int whpx_handle_portio(CPUState *cpu,static int whpx_handle_halt (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;int ret =0 ;qemu_mutex_lock_iothread ();
@@ -781,7 +781,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)HRESULT hr;struct whpx_state *whpx = &whpx_global;struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);int irq;uint8_t tpr;
@@ -903,7 +903,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)static void whpx_vcpu_post_run (CPUState *cpu) {struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu); -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu); env->eflags = vcpu->exit_ctx.VpContext.Rflags;
@@ -927,7 +927,7 @@ static void whpx_vcpu_post_run(CPUState *cpu)static void whpx_vcpu_process_async_events (CPUState *cpu) { -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);struct whpx_vcpu *vcpu =get_whpx_vcpu (cpu);
@@ -1333,7 +1333,7 @@ int whpx_init_vcpu(CPUState *cpu)struct whpx_state *whpx = &whpx_global;struct whpx_vcpu *vcpu =NULL ;Error *local_error =NULL ; -CPUX86State *env = (CPUArchState *)(cpu->env_ptr); +CPUX86State *env = cpu->env_ptr;X86CPU *x86_cpu =X86_CPU (cpu);UINT64 freq =0 ;int ret;
Signature · 1 line
2.34.1
Quoted 10 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé<[email protected]>
Now than we can use the abstract CPUArchState, let's clean up.
Based-on:<[email protected]>
target: Use ArchCPU & CPUArchState as abstract interface to target CPUPhilippe Mathieu-Daudé (2):
accel/tcg: Remove pointless CPUArchState casts target/i386: Remove pointless CPUArchState casts
r~
Quoted 5 lines · Richard Henderson
Quoted 4 lines · Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé<[email protected]>
Now than we can use the abstract CPUArchState, let's clean up.
Quoted 8 lines
Quoted 6 lines
Based-on:<[email protected]>
target: Use ArchCPU & CPUArchState as abstract interface to target CPUPhilippe Mathieu-Daudé (2):
accel/tcg: Remove pointless CPUArchState casts target/i386: Remove pointless CPUArchState castsReviewed-by Richard Henderson <[email protected]>
Thanks, queued as 'abstract-arch-cpu'.