motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/i386: Remove pointless CPUArchState casts

Browse source 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220305233415.64627-3-philippe.mathieu.daude@gmail.com>
This commit is contained in:
Philippe Mathieu-Daudé 2022-03-05 23:35:19 +01:00
parent b36e239e08
commit 95e862d72c
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
target/i386/hax/hax-all.c
View file

@ -222,7 +222,7 @@ int hax_init_vcpu(CPUState *cpu)
cpu->hax_vcpu = hax_global.vm->vcpus[cpu->cpu_index]; cpu->hax_vcpu = hax_global.vm->vcpus[cpu->cpu_index];
cpu->vcpu_dirty = true; 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; return ret;
} }
@ -669,7 +669,7 @@ void hax_cpu_synchronize_pre_loadvm(CPUState *cpu)
int hax_smp_cpu_exec(CPUState *cpu) int hax_smp_cpu_exec(CPUState *cpu)
{ {
CPUArchState *env = (CPUArchState *) (cpu->env_ptr); CPUArchState *env = cpu->env_ptr;
int fatal; int fatal;
int ret; int ret;

14
target/i386/nvmm/nvmm-all.c
View file

@ -85,7 +85,7 @@ nvmm_set_segment(struct nvmm_x64_state_seg *nseg, const SegmentCache *qseg)
static void static void
nvmm_set_registers(CPUState *cpu) nvmm_set_registers(CPUState *cpu)
{ {
CPUX86State *env = (CPUArchState *)cpu->env_ptr; CPUX86State *env = cpu->env_ptr;
struct nvmm_machine *mach = get_nvmm_mach(); struct nvmm_machine *mach = get_nvmm_mach();
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu); struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
struct nvmm_vcpu *vcpu = &qcpu->vcpu; struct nvmm_vcpu *vcpu = &qcpu->vcpu;
@ -222,7 +222,7 @@ nvmm_get_segment(SegmentCache *qseg, const struct nvmm_x64_state_seg *nseg)
static void static void
nvmm_get_registers(CPUState *cpu) nvmm_get_registers(CPUState *cpu)
{ {
CPUX86State *env = (CPUArchState *)cpu->env_ptr; CPUX86State *env = cpu->env_ptr;
struct nvmm_machine *mach = get_nvmm_mach(); struct nvmm_machine *mach = get_nvmm_mach();
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu); struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
struct nvmm_vcpu *vcpu = &qcpu->vcpu; struct nvmm_vcpu *vcpu = &qcpu->vcpu;
@ -347,7 +347,7 @@ nvmm_get_registers(CPUState *cpu)
static bool static bool
nvmm_can_take_int(CPUState *cpu) 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 qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
struct nvmm_vcpu *vcpu = &qcpu->vcpu; struct nvmm_vcpu *vcpu = &qcpu->vcpu;
struct nvmm_machine *mach = get_nvmm_mach(); struct nvmm_machine *mach = get_nvmm_mach();
@ -394,7 +394,7 @@ nvmm_can_take_nmi(CPUState *cpu)
static void static void
nvmm_vcpu_pre_run(CPUState *cpu) 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 nvmm_machine *mach = get_nvmm_mach();
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu); struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
struct nvmm_vcpu *vcpu = &qcpu->vcpu; struct nvmm_vcpu *vcpu = &qcpu->vcpu;
@ -480,7 +480,7 @@ static void
nvmm_vcpu_post_run(CPUState *cpu, struct nvmm_vcpu_exit *exit) nvmm_vcpu_post_run(CPUState *cpu, struct nvmm_vcpu_exit *exit)
{ {
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu); 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); X86CPU *x86_cpu = X86_CPU(cpu);
uint64_t tpr; uint64_t tpr;
@ -652,7 +652,7 @@ static int
nvmm_handle_halted(struct nvmm_machine *mach, CPUState *cpu, nvmm_handle_halted(struct nvmm_machine *mach, CPUState *cpu,
struct nvmm_vcpu_exit *exit) struct nvmm_vcpu_exit *exit)
{ {
CPUX86State *env = (CPUArchState *)cpu->env_ptr; CPUX86State *env = cpu->env_ptr;
int ret = 0; int ret = 0;
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
@ -685,7 +685,7 @@ nvmm_inject_ud(struct nvmm_machine *mach, struct nvmm_vcpu *vcpu)
static int static int
nvmm_vcpu_loop(CPUState *cpu) nvmm_vcpu_loop(CPUState *cpu)
{ {
CPUX86State *env = (CPUArchState *)cpu->env_ptr; CPUX86State *env = cpu->env_ptr;
struct nvmm_machine *mach = get_nvmm_mach(); struct nvmm_machine *mach = get_nvmm_mach();
struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu); struct qemu_vcpu *qcpu = get_qemu_vcpu(cpu);
struct nvmm_vcpu *vcpu = &qcpu->vcpu; struct nvmm_vcpu *vcpu = &qcpu->vcpu;

18
target/i386/whpx/whpx-all.c
View file

@ -221,7 +221,7 @@ static SegmentCache whpx_seg_h2q(const WHV_X64_SEGMENT_REGISTER *hs)
static int whpx_set_tsc(CPUState *cpu) 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_NAME tsc_reg = WHvX64RegisterTsc;
WHV_REGISTER_VALUE tsc_val; WHV_REGISTER_VALUE tsc_val;
HRESULT hr; HRESULT hr;
@ -260,7 +260,7 @@ static void whpx_set_registers(CPUState *cpu, int level)
{ {
struct whpx_state *whpx = &whpx_global; struct whpx_state *whpx = &whpx_global;
struct whpx_vcpu *vcpu = get_whpx_vcpu(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); X86CPU *x86_cpu = X86_CPU(cpu);
struct whpx_register_set vcxt; struct whpx_register_set vcxt;
HRESULT hr; HRESULT hr;
@ -428,7 +428,7 @@ static void whpx_set_registers(CPUState *cpu, int level)
static int whpx_get_tsc(CPUState *cpu) 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_NAME tsc_reg = WHvX64RegisterTsc;
WHV_REGISTER_VALUE tsc_val; WHV_REGISTER_VALUE tsc_val;
HRESULT hr; HRESULT hr;
@ -449,7 +449,7 @@ static void whpx_get_registers(CPUState *cpu)
{ {
struct whpx_state *whpx = &whpx_global; struct whpx_state *whpx = &whpx_global;
struct whpx_vcpu *vcpu = get_whpx_vcpu(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); X86CPU *x86_cpu = X86_CPU(cpu);
struct whpx_register_set vcxt; struct whpx_register_set vcxt;
uint64_t tpr, apic_base; uint64_t tpr, apic_base;
@ -760,7 +760,7 @@ static int whpx_handle_portio(CPUState *cpu,
static int whpx_handle_halt(CPUState *cpu) static int whpx_handle_halt(CPUState *cpu)
{ {
CPUX86State *env = (CPUArchState *)(cpu->env_ptr); CPUX86State *env = cpu->env_ptr;
int ret = 0; int ret = 0;
qemu_mutex_lock_iothread(); qemu_mutex_lock_iothread();
@ -781,7 +781,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)
HRESULT hr; HRESULT hr;
struct whpx_state *whpx = &whpx_global; struct whpx_state *whpx = &whpx_global;
struct whpx_vcpu *vcpu = get_whpx_vcpu(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); X86CPU *x86_cpu = X86_CPU(cpu);
int irq; int irq;
uint8_t tpr; uint8_t tpr;
@ -903,7 +903,7 @@ static void whpx_vcpu_pre_run(CPUState *cpu)
static void whpx_vcpu_post_run(CPUState *cpu) static void whpx_vcpu_post_run(CPUState *cpu)
{ {
struct whpx_vcpu *vcpu = get_whpx_vcpu(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); X86CPU *x86_cpu = X86_CPU(cpu);
env->eflags = vcpu->exit_ctx.VpContext.Rflags; 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) 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); X86CPU *x86_cpu = X86_CPU(cpu);
struct whpx_vcpu *vcpu = get_whpx_vcpu(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_state *whpx = &whpx_global;
struct whpx_vcpu *vcpu = NULL; struct whpx_vcpu *vcpu = NULL;
Error *local_error = NULL; Error *local_error = NULL;
CPUX86State *env = (CPUArchState *)(cpu->env_ptr); CPUX86State *env = cpu->env_ptr;
X86CPU *x86_cpu = X86_CPU(cpu); X86CPU *x86_cpu = X86_CPU(cpu);
UINT64 freq = 0; UINT64 freq = 0;
int ret; int ret;