Most of the codebase uses 'CPUState *cpu' or 'CPUState *cs'.
While 'cpu_state' is kind of explicit, it makes the code
harder to review. Simply rename as 'cpu' like the rest.
Signed-off-by: Philippe Mathieu-Daudé <philmd@xxxxxxxxxx>
---
target/i386/hvf/x86hvf.h | 12 +-
target/i386/hvf/x86hvf.c | 356 +++++++++++++++++++--------------------
2 files changed, 184 insertions(+), 184 deletions(-)
diff --git a/target/i386/hvf/x86hvf.h b/target/i386/hvf/x86hvf.h
index db6003d6bd..6527eb90d4 100644
--- a/target/i386/hvf/x86hvf.h
+++ b/target/i386/hvf/x86hvf.h
@@ -20,15 +20,15 @@
#include "cpu.h"
#include "x86_descr.h"
-int hvf_process_events(CPUState *);
-bool hvf_inject_interrupts(CPUState *);
+int hvf_process_events(CPUState *cpu);
+bool hvf_inject_interrupts(CPUState *cpu);
void hvf_set_segment(struct CPUState *cpu, struct vmx_segment *vmx_seg,
SegmentCache *qseg, bool is_tr);
void hvf_get_segment(SegmentCache *qseg, struct vmx_segment *vmx_seg);
-void hvf_put_xsave(CPUState *cpu_state);
-void hvf_put_msrs(CPUState *cpu_state);
-void hvf_get_xsave(CPUState *cpu_state);
-void hvf_get_msrs(CPUState *cpu_state);
+void hvf_put_xsave(CPUState *cpu);
+void hvf_put_msrs(CPUState *cpu);
+void hvf_get_xsave(CPUState *cpu);
+void hvf_get_msrs(CPUState *cpu);
void vmx_clear_int_window_exiting(CPUState *cpu);
void vmx_update_tpr(CPUState *cpu);
#endif
diff --git a/target/i386/hvf/x86hvf.c b/target/i386/hvf/x86hvf.c
index 69d4fb8cf5..dfa500b81d 100644
--- a/target/i386/hvf/x86hvf.c
+++ b/target/i386/hvf/x86hvf.c
@@ -70,255 +70,255 @@ void hvf_get_segment(SegmentCache *qseg, struct vmx_segment *vmx_seg)
(((vmx_seg->ar >> 15) & 1) << DESC_G_SHIFT);
}
-void hvf_put_xsave(CPUState *cpu_state)
+void hvf_put_xsave(CPUState *cpu)
{
- void *xsave = X86_CPU(cpu_state)->env.xsave_buf;
- uint32_t xsave_len = X86_CPU(cpu_state)->env.xsave_buf_len;
+ void *xsave = X86_CPU(cpu)->env.xsave_buf;
+ uint32_t xsave_len = X86_CPU(cpu)->env.xsave_buf_len;
- x86_cpu_xsave_all_areas(X86_CPU(cpu_state), xsave, xsave_len);
+ x86_cpu_xsave_all_areas(X86_CPU(cpu), xsave, xsave_len);
- if (hv_vcpu_write_fpstate(cpu_state->hvf->fd, xsave, xsave_len)) {
+ if (hv_vcpu_write_fpstate(cpu->hvf->fd, xsave, xsave_len)) {
abort();
}
}
-static void hvf_put_segments(CPUState *cpu_state)
+static void hvf_put_segments(CPUState *cpu)
{
- CPUX86State *env = &X86_CPU(cpu_state)->env;
+ CPUX86State *env = &X86_CPU(cpu)->env;
struct vmx_segment seg;
- wvmcs(cpu_state->hvf->fd, VMCS_GUEST_IDTR_LIMIT, env->idt.limit);
- wvmcs(cpu_state->hvf->fd, VMCS_GUEST_IDTR_BASE, env->idt.base);
+ wvmcs(cpu->hvf->fd, VMCS_GUEST_IDTR_LIMIT, env->idt.limit);
+ wvmcs(cpu->hvf->fd, VMCS_GUEST_IDTR_BASE, env->idt.base);
- wvmcs(cpu_state->hvf->fd, VMCS_GUEST_GDTR_LIMIT, env->gdt.limit);
- wvmcs(cpu_state->hvf->fd, VMCS_GUEST_GDTR_BASE, env->gdt.base);
+ wvmcs(cpu->hvf->fd, VMCS_GUEST_GDTR_LIMIT, env->gdt.limit);
+ wvmcs(cpu->hvf->fd, VMCS_GUEST_GDTR_BASE, env->gdt.base);
- /* wvmcs(cpu_state->hvf->fd, VMCS_GUEST_CR2, env->cr[2]); */
- wvmcs(cpu_state->hvf->fd, VMCS_GUEST_CR3, env->cr[3]);
- vmx_update_tpr(cpu_state);
- wvmcs(cpu_state->hvf->fd, VMCS_GUEST_IA32_EFER, env->efer);
+ /* wvmcs(cpu->hvf->fd, VMCS_GUEST_CR2, env->cr[2]); */
+ wvmcs(cpu->hvf->fd, VMCS_GUEST_CR3, env->cr[3]);
+ vmx_update_tpr(cpu);
+ wvmcs(cpu->hvf->fd, VMCS_GUEST_IA32_EFER, env->efer);
- macvm_set_cr4(cpu_state->hvf->fd, env->cr[4]);
- macvm_set_cr0(cpu_state->hvf->fd, env->cr[0]);
+ macvm_set_cr4(cpu->hvf->fd, env->cr[4]);
+ macvm_set_cr0(cpu->hvf->fd, env->cr[0]);
- hvf_set_segment(cpu_state, &seg, &env->segs[R_CS], false);
- vmx_write_segment_descriptor(cpu_state, &seg, R_CS);
+ hvf_set_segment(cpu, &seg, &env->segs[R_CS], false);
+ vmx_write_segment_descriptor(cpu, &seg, R_CS);
- hvf_set_segment(cpu_state, &seg, &env->segs[R_DS], false);
- vmx_write_segment_descriptor(cpu_state, &seg, R_DS);
+ hvf_set_segment(cpu, &seg, &env->segs[R_DS], false);
+ vmx_write_segment_descriptor(cpu, &seg, R_DS);
- hvf_set_segment(cpu_state, &seg, &env->segs[R_ES], false);
- vmx_write_segment_descriptor(cpu_state, &seg, R_ES);
+ hvf_set_segment(cpu, &seg, &env->segs[R_ES], false);
+ vmx_write_segment_descriptor(cpu, &seg, R_ES);
- hvf_set_segment(cpu_state, &seg, &env->segs[R_SS], false);
- vmx_write_segment_descriptor(cpu_state, &seg, R_SS);
+ hvf_set_segment(cpu, &seg, &env->segs[R_SS], false);
+ vmx_write_segment_descriptor(cpu, &seg, R_SS);
- hvf_set_segment(cpu_state, &seg, &env->segs[R_FS], false);
- vmx_write_segment_descriptor(cpu_state, &seg, R_FS);
+ hvf_set_segment(cpu, &seg, &env->segs[R_FS], false);
+ vmx_write_segment_descriptor(cpu, &seg, R_FS);
- hvf_set_segment(cpu_state, &seg, &env->segs[R_GS], false);
- vmx_write_segment_descriptor(cpu_state, &seg, R_GS);
+ hvf_set_segment(cpu, &seg, &env->segs[R_GS], false);
+ vmx_write_segment_descriptor(cpu, &seg, R_GS);
- hvf_set_segment(cpu_state, &seg, &env->tr, true);
- vmx_write_segment_descriptor(cpu_state, &seg, R_TR);
+ hvf_set_segment(cpu, &seg, &env->tr, true);
+ vmx_write_segment_descriptor(cpu, &seg, R_TR);
- hvf_set_segment(cpu_state, &seg, &env->ldt, false);
- vmx_write_segment_descriptor(cpu_state, &seg, R_LDTR);
+ hvf_set_segment(cpu, &seg, &env->ldt, false);
+ vmx_write_segment_descriptor(cpu, &seg, R_LDTR);
}
-void hvf_put_msrs(CPUState *cpu_state)
+void hvf_put_msrs(CPUState *cpu)
{
- CPUX86State *env = &X86_CPU(cpu_state)->env;
+ CPUX86State *env = &X86_CPU(cpu)->env;
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_IA32_SYSENTER_CS,
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_IA32_SYSENTER_CS,
env->sysenter_cs);
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_IA32_SYSENTER_ESP,
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_IA32_SYSENTER_ESP,
env->sysenter_esp);
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_IA32_SYSENTER_EIP,
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_IA32_SYSENTER_EIP,
env->sysenter_eip);
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_STAR, env->star);
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_STAR, env->star);
#ifdef TARGET_X86_64
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_CSTAR, env->cstar);
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_KERNELGSBASE, env->kernelgsbase);
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_FMASK, env->fmask);
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_LSTAR, env->lstar);
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_CSTAR, env->cstar);
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_KERNELGSBASE, env->kernelgsbase);
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_FMASK, env->fmask);
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_LSTAR, env->lstar);
#endif
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_GSBASE, env->segs[R_GS].base);
- hv_vcpu_write_msr(cpu_state->hvf->fd, MSR_FSBASE, env->segs[R_FS].base);
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_GSBASE, env->segs[R_GS].base);
+ hv_vcpu_write_msr(cpu->hvf->fd, MSR_FSBASE, env->segs[R_FS].base);
}
-void hvf_get_xsave(CPUState *cpu_state)
+void hvf_get_xsave(CPUState *cpu)
{
- void *xsave = X86_CPU(cpu_state)->env.xsave_buf;
- uint32_t xsave_len = X86_CPU(cpu_state)->env.xsave_buf_len;
+ void *xsave = X86_CPU(cpu)->env.xsave_buf;
+ uint32_t xsave_len = X86_CPU(cpu)->env.xsave_buf_len;
- if (hv_vcpu_read_fpstate(cpu_state->hvf->fd, xsave, xsave_len)) {
+ if (hv_vcpu_read_fpstate(cpu->hvf->fd, xsave, xsave_len)) {
abort();
}
- x86_cpu_xrstor_all_areas(X86_CPU(cpu_state), xsave, xsave_len);
+ x86_cpu_xrstor_all_areas(X86_CPU(cpu), xsave, xsave_len);
}
-static void hvf_get_segments(CPUState *cpu_state)
+static void hvf_get_segments(CPUState *cpu)
{
- CPUX86State *env = &X86_CPU(cpu_state)->env;
+ CPUX86State *env = &X86_CPU(cpu)->env;
struct vmx_segment seg;
env->interrupt_injected = -1;
- vmx_read_segment_descriptor(cpu_state, &seg, R_CS);
+ vmx_read_segment_descriptor(cpu, &seg, R_CS);
hvf_get_segment(&env->segs[R_CS], &seg);
- vmx_read_segment_descriptor(cpu_state, &seg, R_DS);
+ vmx_read_segment_descriptor(cpu, &seg, R_DS);
hvf_get_segment(&env->segs[R_DS], &seg);
- vmx_read_segment_descriptor(cpu_state, &seg, R_ES);
+ vmx_read_segment_descriptor(cpu, &seg, R_ES);
hvf_get_segment(&env->segs[R_ES], &seg);
- vmx_read_segment_descriptor(cpu_state, &seg, R_FS);
+ vmx_read_segment_descriptor(cpu, &seg, R_FS);
hvf_get_segment(&env->segs[R_FS], &seg);
- vmx_read_segment_descriptor(cpu_state, &seg, R_GS);
+ vmx_read_segment_descriptor(cpu, &seg, R_GS);
hvf_get_segment(&env->segs[R_GS], &seg);
- vmx_read_segment_descriptor(cpu_state, &seg, R_SS);
+ vmx_read_segment_descriptor(cpu, &seg, R_SS);
hvf_get_segment(&env->segs[R_SS], &seg);
- vmx_read_segment_descriptor(cpu_state, &seg, R_TR);
+ vmx_read_segment_descriptor(cpu, &seg, R_TR);
hvf_get_segment(&env->tr, &seg);
- vmx_read_segment_descriptor(cpu_state, &seg, R_LDTR);
+ vmx_read_segment_descriptor(cpu, &seg, R_LDTR);
hvf_get_segment(&env->ldt, &seg);
- env->idt.limit = rvmcs(cpu_state->hvf->fd, VMCS_GUEST_IDTR_LIMIT);
- env->idt.base = rvmcs(cpu_state->hvf->fd, VMCS_GUEST_IDTR_BASE);
- env->gdt.limit = rvmcs(cpu_state->hvf->fd, VMCS_GUEST_GDTR_LIMIT);
- env->gdt.base = rvmcs(cpu_state->hvf->fd, VMCS_GUEST_GDTR_BASE);
+ env->idt.limit = rvmcs(cpu->hvf->fd, VMCS_GUEST_IDTR_LIMIT);
+ env->idt.base = rvmcs(cpu->hvf->fd, VMCS_GUEST_IDTR_BASE);
+ env->gdt.limit = rvmcs(cpu->hvf->fd, VMCS_GUEST_GDTR_LIMIT);
+ env->gdt.base = rvmcs(cpu->hvf->fd, VMCS_GUEST_GDTR_BASE);
- env->cr[0] = rvmcs(cpu_state->hvf->fd, VMCS_GUEST_CR0);
+ env->cr[0] = rvmcs(cpu->hvf->fd, VMCS_GUEST_CR0);
env->cr[2] = 0;
- env->cr[3] = rvmcs(cpu_state->hvf->fd, VMCS_GUEST_CR3);
- env->cr[4] = rvmcs(cpu_state->hvf->fd, VMCS_GUEST_CR4);
+ env->cr[3] = rvmcs(cpu->hvf->fd, VMCS_GUEST_CR3);
+ env->cr[4] = rvmcs(cpu->hvf->fd, VMCS_GUEST_CR4);
- env->efer = rvmcs(cpu_state->hvf->fd, VMCS_GUEST_IA32_EFER);
+ env->efer = rvmcs(cpu->hvf->fd, VMCS_GUEST_IA32_EFER);
}
-void hvf_get_msrs(CPUState *cpu_state)
+void hvf_get_msrs(CPUState *cpu)
{
- CPUX86State *env = &X86_CPU(cpu_state)->env;
+ CPUX86State *env = &X86_CPU(cpu)->env;
uint64_t tmp;
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_IA32_SYSENTER_CS, &tmp);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_IA32_SYSENTER_CS, &tmp);
env->sysenter_cs = tmp;
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_IA32_SYSENTER_ESP, &tmp);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_IA32_SYSENTER_ESP, &tmp);
env->sysenter_esp = tmp;
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_IA32_SYSENTER_EIP, &tmp);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_IA32_SYSENTER_EIP, &tmp);
env->sysenter_eip = tmp;
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_STAR, &env->star);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_STAR, &env->star);
#ifdef TARGET_X86_64
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_CSTAR, &env->cstar);
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_KERNELGSBASE, &env->kernelgsbase);
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_FMASK, &env->fmask);
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_LSTAR, &env->lstar);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_CSTAR, &env->cstar);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_KERNELGSBASE, &env->kernelgsbase);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_FMASK, &env->fmask);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_LSTAR, &env->lstar);
#endif
- hv_vcpu_read_msr(cpu_state->hvf->fd, MSR_IA32_APICBASE, &tmp);
+ hv_vcpu_read_msr(cpu->hvf->fd, MSR_IA32_APICBASE, &tmp);
- env->tsc = rdtscp() + rvmcs(cpu_state->hvf->fd, VMCS_TSC_OFFSET);
+ env->tsc = rdtscp() + rvmcs(cpu->hvf->fd, VMCS_TSC_OFFSET);
}
-int hvf_put_registers(CPUState *cpu_state)
+int hvf_put_registers(CPUState *cpu)
{
- X86CPU *x86cpu = X86_CPU(cpu_state);
+ X86CPU *x86cpu = X86_CPU(cpu);
CPUX86State *env = &x86cpu->env;
- wreg(cpu_state->hvf->fd, HV_X86_RAX, env->regs[R_EAX]);
- wreg(cpu_state->hvf->fd, HV_X86_RBX, env->regs[R_EBX]);
- wreg(cpu_state->hvf->fd, HV_X86_RCX, env->regs[R_ECX]);
- wreg(cpu_state->hvf->fd, HV_X86_RDX, env->regs[R_EDX]);
- wreg(cpu_state->hvf->fd, HV_X86_RBP, env->regs[R_EBP]);
- wreg(cpu_state->hvf->fd, HV_X86_RSP, env->regs[R_ESP]);
- wreg(cpu_state->hvf->fd, HV_X86_RSI, env->regs[R_ESI]);
- wreg(cpu_state->hvf->fd, HV_X86_RDI, env->regs[R_EDI]);
- wreg(cpu_state->hvf->fd, HV_X86_R8, env->regs[8]);
- wreg(cpu_state->hvf->fd, HV_X86_R9, env->regs[9]);
- wreg(cpu_state->hvf->fd, HV_X86_R10, env->regs[10]);
- wreg(cpu_state->hvf->fd, HV_X86_R11, env->regs[11]);
- wreg(cpu_state->hvf->fd, HV_X86_R12, env->regs[12]);
- wreg(cpu_state->hvf->fd, HV_X86_R13, env->regs[13]);
- wreg(cpu_state->hvf->fd, HV_X86_R14, env->regs[14]);
- wreg(cpu_state->hvf->fd, HV_X86_R15, env->regs[15]);
- wreg(cpu_state->hvf->fd, HV_X86_RFLAGS, env->eflags);
- wreg(cpu_state->hvf->fd, HV_X86_RIP, env->eip);
+ wreg(cpu->hvf->fd, HV_X86_RAX, env->regs[R_EAX]);
+ wreg(cpu->hvf->fd, HV_X86_RBX, env->regs[R_EBX]);
+ wreg(cpu->hvf->fd, HV_X86_RCX, env->regs[R_ECX]);
+ wreg(cpu->hvf->fd, HV_X86_RDX, env->regs[R_EDX]);
+ wreg(cpu->hvf->fd, HV_X86_RBP, env->regs[R_EBP]);
+ wreg(cpu->hvf->fd, HV_X86_RSP, env->regs[R_ESP]);
+ wreg(cpu->hvf->fd, HV_X86_RSI, env->regs[R_ESI]);
+ wreg(cpu->hvf->fd, HV_X86_RDI, env->regs[R_EDI]);
+ wreg(cpu->hvf->fd, HV_X86_R8, env->regs[8]);
+ wreg(cpu->hvf->fd, HV_X86_R9, env->regs[9]);
+ wreg(cpu->hvf->fd, HV_X86_R10, env->regs[10]);
+ wreg(cpu->hvf->fd, HV_X86_R11, env->regs[11]);
+ wreg(cpu->hvf->fd, HV_X86_R12, env->regs[12]);
+ wreg(cpu->hvf->fd, HV_X86_R13, env->regs[13]);
+ wreg(cpu->hvf->fd, HV_X86_R14, env->regs[14]);
+ wreg(cpu->hvf->fd, HV_X86_R15, env->regs[15]);
+ wreg(cpu->hvf->fd, HV_X86_RFLAGS, env->eflags);
+ wreg(cpu->hvf->fd, HV_X86_RIP, env->eip);
- wreg(cpu_state->hvf->fd, HV_X86_XCR0, env->xcr0);
+ wreg(cpu->hvf->fd, HV_X86_XCR0, env->xcr0);
- hvf_put_xsave(cpu_state);
+ hvf_put_xsave(cpu);
- hvf_put_segments(cpu_state);
+ hvf_put_segments(cpu);
- hvf_put_msrs(cpu_state);
+ hvf_put_msrs(cpu);
- wreg(cpu_state->hvf->fd, HV_X86_DR0, env->dr[0]);
- wreg(cpu_state->hvf->fd, HV_X86_DR1, env->dr[1]);
- wreg(cpu_state->hvf->fd, HV_X86_DR2, env->dr[2]);
- wreg(cpu_state->hvf->fd, HV_X86_DR3, env->dr[3]);
- wreg(cpu_state->hvf->fd, HV_X86_DR4, env->dr[4]);
- wreg(cpu_state->hvf->fd, HV_X86_DR5, env->dr[5]);
- wreg(cpu_state->hvf->fd, HV_X86_DR6, env->dr[6]);
- wreg(cpu_state->hvf->fd, HV_X86_DR7, env->dr[7]);
+ wreg(cpu->hvf->fd, HV_X86_DR0, env->dr[0]);
+ wreg(cpu->hvf->fd, HV_X86_DR1, env->dr[1]);
+ wreg(cpu->hvf->fd, HV_X86_DR2, env->dr[2]);
+ wreg(cpu->hvf->fd, HV_X86_DR3, env->dr[3]);
+ wreg(cpu->hvf->fd, HV_X86_DR4, env->dr[4]);
+ wreg(cpu->hvf->fd, HV_X86_DR5, env->dr[5]);
+ wreg(cpu->hvf->fd, HV_X86_DR6, env->dr[6]);
+ wreg(cpu->hvf->fd, HV_X86_DR7, env->dr[7]);
return 0;
}
-int hvf_get_registers(CPUState *cpu_state)
+int hvf_get_registers(CPUState *cpu)
{
- X86CPU *x86cpu = X86_CPU(cpu_state);
+ X86CPU *x86cpu = X86_CPU(cpu);
CPUX86State *env = &x86cpu->env;
- env->regs[R_EAX] = rreg(cpu_state->hvf->fd, HV_X86_RAX);
- env->regs[R_EBX] = rreg(cpu_state->hvf->fd, HV_X86_RBX);
- env->regs[R_ECX] = rreg(cpu_state->hvf->fd, HV_X86_RCX);
- env->regs[R_EDX] = rreg(cpu_state->hvf->fd, HV_X86_RDX);
- env->regs[R_EBP] = rreg(cpu_state->hvf->fd, HV_X86_RBP);
- env->regs[R_ESP] = rreg(cpu_state->hvf->fd, HV_X86_RSP);
- env->regs[R_ESI] = rreg(cpu_state->hvf->fd, HV_X86_RSI);
- env->regs[R_EDI] = rreg(cpu_state->hvf->fd, HV_X86_RDI);
- env->regs[8] = rreg(cpu_state->hvf->fd, HV_X86_R8);
- env->regs[9] = rreg(cpu_state->hvf->fd, HV_X86_R9);
- env->regs[10] = rreg(cpu_state->hvf->fd, HV_X86_R10);
- env->regs[11] = rreg(cpu_state->hvf->fd, HV_X86_R11);
- env->regs[12] = rreg(cpu_state->hvf->fd, HV_X86_R12);
- env->regs[13] = rreg(cpu_state->hvf->fd, HV_X86_R13);
- env->regs[14] = rreg(cpu_state->hvf->fd, HV_X86_R14);
- env->regs[15] = rreg(cpu_state->hvf->fd, HV_X86_R15);
+ env->regs[R_EAX] = rreg(cpu->hvf->fd, HV_X86_RAX);
+ env->regs[R_EBX] = rreg(cpu->hvf->fd, HV_X86_RBX);
+ env->regs[R_ECX] = rreg(cpu->hvf->fd, HV_X86_RCX);
+ env->regs[R_EDX] = rreg(cpu->hvf->fd, HV_X86_RDX);
+ env->regs[R_EBP] = rreg(cpu->hvf->fd, HV_X86_RBP);
+ env->regs[R_ESP] = rreg(cpu->hvf->fd, HV_X86_RSP);
+ env->regs[R_ESI] = rreg(cpu->hvf->fd, HV_X86_RSI);
+ env->regs[R_EDI] = rreg(cpu->hvf->fd, HV_X86_RDI);
+ env->regs[8] = rreg(cpu->hvf->fd, HV_X86_R8);
+ env->regs[9] = rreg(cpu->hvf->fd, HV_X86_R9);
+ env->regs[10] = rreg(cpu->hvf->fd, HV_X86_R10);
+ env->regs[11] = rreg(cpu->hvf->fd, HV_X86_R11);
+ env->regs[12] = rreg(cpu->hvf->fd, HV_X86_R12);
+ env->regs[13] = rreg(cpu->hvf->fd, HV_X86_R13);
+ env->regs[14] = rreg(cpu->hvf->fd, HV_X86_R14);
+ env->regs[15] = rreg(cpu->hvf->fd, HV_X86_R15);
- env->eflags = rreg(cpu_state->hvf->fd, HV_X86_RFLAGS);
- env->eip = rreg(cpu_state->hvf->fd, HV_X86_RIP);
+ env->eflags = rreg(cpu->hvf->fd, HV_X86_RFLAGS);
+ env->eip = rreg(cpu->hvf->fd, HV_X86_RIP);
- hvf_get_xsave(cpu_state);
- env->xcr0 = rreg(cpu_state->hvf->fd, HV_X86_XCR0);
+ hvf_get_xsave(cpu);
+ env->xcr0 = rreg(cpu->hvf->fd, HV_X86_XCR0);
- hvf_get_segments(cpu_state);
- hvf_get_msrs(cpu_state);
+ hvf_get_segments(cpu);
+ hvf_get_msrs(cpu);
- env->dr[0] = rreg(cpu_state->hvf->fd, HV_X86_DR0);
- env->dr[1] = rreg(cpu_state->hvf->fd, HV_X86_DR1);
- env->dr[2] = rreg(cpu_state->hvf->fd, HV_X86_DR2);
- env->dr[3] = rreg(cpu_state->hvf->fd, HV_X86_DR3);
- env->dr[4] = rreg(cpu_state->hvf->fd, HV_X86_DR4);
- env->dr[5] = rreg(cpu_state->hvf->fd, HV_X86_DR5);
- env->dr[6] = rreg(cpu_state->hvf->fd, HV_X86_DR6);
- env->dr[7] = rreg(cpu_state->hvf->fd, HV_X86_DR7);
+ env->dr[0] = rreg(cpu->hvf->fd, HV_X86_DR0);
+ env->dr[1] = rreg(cpu->hvf->fd, HV_X86_DR1);
+ env->dr[2] = rreg(cpu->hvf->fd, HV_X86_DR2);
+ env->dr[3] = rreg(cpu->hvf->fd, HV_X86_DR3);
+ env->dr[4] = rreg(cpu->hvf->fd, HV_X86_DR4);
+ env->dr[5] = rreg(cpu->hvf->fd, HV_X86_DR5);
+ env->dr[6] = rreg(cpu->hvf->fd, HV_X86_DR6);
+ env->dr[7] = rreg(cpu->hvf->fd, HV_X86_DR7);
x86_update_hflags(env);
return 0;
@@ -340,9 +340,9 @@ void vmx_clear_int_window_exiting(CPUState *cpu)
~VMCS_PRI_PROC_BASED_CTLS_INT_WINDOW_EXITING);
}
-bool hvf_inject_interrupts(CPUState *cpu_state)
+bool hvf_inject_interrupts(CPUState *cpu)
{
- X86CPU *x86cpu = X86_CPU(cpu_state);
+ X86CPU *x86cpu = X86_CPU(cpu);
CPUX86State *env = &x86cpu->env;
uint8_t vector;
@@ -372,89 +372,89 @@ bool hvf_inject_interrupts(CPUState *cpu_state)
uint64_t info = 0;
if (have_event) {
info = vector | intr_type | VMCS_INTR_VALID;
- uint64_t reason = rvmcs(cpu_state->hvf->fd, VMCS_EXIT_REASON);
+ uint64_t reason = rvmcs(cpu->hvf->fd, VMCS_EXIT_REASON);
if (env->nmi_injected && reason != EXIT_REASON_TASK_SWITCH) {
- vmx_clear_nmi_blocking(cpu_state);
+ vmx_clear_nmi_blocking(cpu);
}
if (!(env->hflags2 & HF2_NMI_MASK) || intr_type != VMCS_INTR_T_NMI) {
info &= ~(1 << 12); /* clear undefined bit */
if (intr_type == VMCS_INTR_T_SWINTR ||
intr_type == VMCS_INTR_T_SWEXCEPTION) {
- wvmcs(cpu_state->hvf->fd, VMCS_ENTRY_INST_LENGTH, env->ins_len);
+ wvmcs(cpu->hvf->fd, VMCS_ENTRY_INST_LENGTH, env->ins_len);
}
if (env->has_error_code) {
- wvmcs(cpu_state->hvf->fd, VMCS_ENTRY_EXCEPTION_ERROR,
+ wvmcs(cpu->hvf->fd, VMCS_ENTRY_EXCEPTION_ERROR,
env->error_code);
/* Indicate that VMCS_ENTRY_EXCEPTION_ERROR is valid */
info |= VMCS_INTR_DEL_ERRCODE;
}
/*printf("reinject %lx err %d\n", info, err);*/
- wvmcs(cpu_state->hvf->fd, VMCS_ENTRY_INTR_INFO, info);
+ wvmcs(cpu->hvf->fd, VMCS_ENTRY_INTR_INFO, info);
};
}
- if (cpu_state->interrupt_request & CPU_INTERRUPT_NMI) {
+ if (cpu->interrupt_request & CPU_INTERRUPT_NMI) {
if (!(env->hflags2 & HF2_NMI_MASK) && !(info & VMCS_INTR_VALID)) {
- cpu_state->interrupt_request &= ~CPU_INTERRUPT_NMI;
+ cpu->interrupt_request &= ~CPU_INTERRUPT_NMI;
info = VMCS_INTR_VALID | VMCS_INTR_T_NMI | EXCP02_NMI;
- wvmcs(cpu_state->hvf->fd, VMCS_ENTRY_INTR_INFO, info);
+ wvmcs(cpu->hvf->fd, VMCS_ENTRY_INTR_INFO, info);
} else {
- vmx_set_nmi_window_exiting(cpu_state);
+ vmx_set_nmi_window_exiting(cpu);
}
}
if (!(env->hflags & HF_INHIBIT_IRQ_MASK) &&
- (cpu_state->interrupt_request & CPU_INTERRUPT_HARD) &&
+ (cpu->interrupt_request & CPU_INTERRUPT_HARD) &&
(env->eflags & IF_MASK) && !(info & VMCS_INTR_VALID)) {
int line = cpu_get_pic_interrupt(&x86cpu->env);
- cpu_state->interrupt_request &= ~CPU_INTERRUPT_HARD;
+ cpu->interrupt_request &= ~CPU_INTERRUPT_HARD;
if (line >= 0) {
- wvmcs(cpu_state->hvf->fd, VMCS_ENTRY_INTR_INFO, line |
+ wvmcs(cpu->hvf->fd, VMCS_ENTRY_INTR_INFO, line |
VMCS_INTR_VALID | VMCS_INTR_T_HWINTR);
}
}
- if (cpu_state->interrupt_request & CPU_INTERRUPT_HARD) {
- vmx_set_int_window_exiting(cpu_state);
+ if (cpu->interrupt_request & CPU_INTERRUPT_HARD) {
+ vmx_set_int_window_exiting(cpu);
}
- return (cpu_state->interrupt_request
+ return (cpu->interrupt_request
& (CPU_INTERRUPT_INIT | CPU_INTERRUPT_TPR));
}
-int hvf_process_events(CPUState *cpu_state)
+int hvf_process_events(CPUState *cpu)
{
- X86CPU *cpu = X86_CPU(cpu_state);
+ X86CPU *cpu = X86_CPU(cpu);
CPUX86State *env = &cpu->env;
- if (!cpu_state->vcpu_dirty) {
+ if (!cpu->vcpu_dirty) {
/* light weight sync for CPU_INTERRUPT_HARD and IF_MASK */
- env->eflags = rreg(cpu_state->hvf->fd, HV_X86_RFLAGS);
+ env->eflags = rreg(cpu->hvf->fd, HV_X86_RFLAGS);
}
- if (cpu_state->interrupt_request & CPU_INTERRUPT_INIT) {
- cpu_synchronize_state(cpu_state);
+ if (cpu->interrupt_request & CPU_INTERRUPT_INIT) {
+ cpu_synchronize_state(cpu);
do_cpu_init(cpu);
}
- if (cpu_state->interrupt_request & CPU_INTERRUPT_POLL) {
- cpu_state->interrupt_request &= ~CPU_INTERRUPT_POLL;
+ if (cpu->interrupt_request & CPU_INTERRUPT_POLL) {
+ cpu->interrupt_request &= ~CPU_INTERRUPT_POLL;
apic_poll_irq(cpu->apic_state);
}
- if (((cpu_state->interrupt_request & CPU_INTERRUPT_HARD) &&
+ if (((cpu->interrupt_request & CPU_INTERRUPT_HARD) &&
(env->eflags & IF_MASK)) ||
- (cpu_state->interrupt_request & CPU_INTERRUPT_NMI)) {
- cpu_state->halted = 0;
+ (cpu->interrupt_request & CPU_INTERRUPT_NMI)) {
+ cpu->halted = 0;
}
- if (cpu_state->interrupt_request & CPU_INTERRUPT_SIPI) {
- cpu_synchronize_state(cpu_state);
+ if (cpu->interrupt_request & CPU_INTERRUPT_SIPI) {
+ cpu_synchronize_state(cpu);
do_cpu_sipi(cpu);
}
- if (cpu_state->interrupt_request & CPU_INTERRUPT_TPR) {
- cpu_state->interrupt_request &= ~CPU_INTERRUPT_TPR;
- cpu_synchronize_state(cpu_state);
+ if (cpu->interrupt_request & CPU_INTERRUPT_TPR) {
+ cpu->interrupt_request &= ~CPU_INTERRUPT_TPR;
+ cpu_synchronize_state(cpu);
apic_handle_tpr_access_report(cpu->apic_state, env->eip,
env->tpr_access_type);
}
- return cpu_state->halted;
+ return cpu->halted;
}
--
2.38.1
