OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

HV: instr_emul: Rename emul_cnx to emul_ctxt 

ctxt is a more general abbreviation of context.

Signed-off-by: Kaige Fu <kaige.fu@intel.com>
Acked-by: Eddie Dong <eddie.dong@intel.com>
This commit is contained in:
Kaige Fu 2018-07-06 14:05:15 +08:00 committed by wenlingz
parent 211fcd4f40
commit 21f0bddff8
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hypervisor/arch/x86/guest/instr_emul_wrapper.c
View File

@ -258,19 +258,19 @@ static uint32_t get_vmcs_field(enum cpu_reg_name ident)
}
}
static void get_guest_paging_info(struct vcpu *vcpu, struct emul_cnx *emul_cnx,
static void get_guest_paging_info(struct vcpu *vcpu, struct emul_ctxt *emul_ctxt,
uint32_t csar)
{
uint8_t cpl;
ASSERT(emul_cnx != NULL && vcpu != NULL, "Error in input arguments");
ASSERT(emul_ctxt != NULL && vcpu != NULL, "Error in input arguments");
cpl = (uint8_t)((csar >> 5) & 3U);
emul_cnx->paging.cr3 =
emul_ctxt->paging.cr3 =
vcpu->arch_vcpu.contexts[vcpu->arch_vcpu.cur_context].cr3;
emul_cnx->paging.cpl = cpl;
emul_cnx->paging.cpu_mode = get_vcpu_mode(vcpu);
emul_cnx->paging.paging_mode = get_vcpu_paging_mode(vcpu);
emul_ctxt->paging.cpl = cpl;
emul_ctxt->paging.cpu_mode = get_vcpu_mode(vcpu);
emul_ctxt->paging.paging_mode = get_vcpu_paging_mode(vcpu);
}
static int mmio_read(struct vcpu *vcpu, __unused uint64_t gpa, uint64_t *rval,
@ -295,15 +295,15 @@ static int mmio_write(struct vcpu *vcpu, __unused uint64_t gpa, uint64_t wval,
int decode_instruction(struct vcpu *vcpu)
{
struct emul_cnx *emul_cnx;
struct emul_ctxt *emul_ctxt;
uint32_t csar;
int retval = 0;
enum vm_cpu_mode cpu_mode;
emul_cnx = &per_cpu(g_inst_ctxt, vcpu->pcpu_id);
emul_cnx->vcpu = vcpu;
emul_ctxt = &per_cpu(g_inst_ctxt, vcpu->pcpu_id);
emul_ctxt->vcpu = vcpu;
retval = vie_init(&emul_cnx->vie, vcpu);
retval = vie_init(&emul_ctxt->vie, vcpu);
if (retval < 0) {
if (retval != -EFAULT) {
pr_err("decode instruction failed @ 0x%016llx:",
@ -314,11 +314,11 @@ int decode_instruction(struct vcpu *vcpu)
}
csar = (uint32_t)exec_vmread(VMX_GUEST_CS_ATTR);
get_guest_paging_info(vcpu, emul_cnx, csar);
get_guest_paging_info(vcpu, emul_ctxt, csar);
cpu_mode = get_vcpu_mode(vcpu);
retval = __decode_instruction(cpu_mode, SEG_DESC_DEF32(csar),
&emul_cnx->vie);
&emul_ctxt->vie);
if (retval != 0) {
pr_err("decode instruction failed @ 0x%016llx:",
@ -326,23 +326,23 @@ int decode_instruction(struct vcpu *vcpu)
return -EINVAL;
}
return emul_cnx->vie.opsize;
return emul_ctxt->vie.opsize;
}
int emulate_instruction(struct vcpu *vcpu)
{
struct emul_cnx *emul_cnx;
struct emul_ctxt *emul_ctxt;
struct vm_guest_paging *paging;
int retval = 0;
uint64_t gpa = vcpu->mmio.paddr;
mem_region_read_t mread = mmio_read;
mem_region_write_t mwrite = mmio_write;
emul_cnx = &per_cpu(g_inst_ctxt, vcpu->pcpu_id);
paging = &emul_cnx->paging;
emul_ctxt = &per_cpu(g_inst_ctxt, vcpu->pcpu_id);
paging = &emul_ctxt->paging;
retval = vmm_emulate_instruction(vcpu, gpa,
&emul_cnx->vie, paging, mread, mwrite, NULL);
&emul_ctxt->vie, paging, mread, mwrite, NULL);
return retval;
}

2
hypervisor/arch/x86/guest/instr_emul_wrapper.h
View File

@ -178,7 +178,7 @@ struct vm_guest_paging {
enum vm_paging_mode paging_mode;
};
struct emul_cnx {
struct emul_ctxt {
struct vie vie;
struct vm_guest_paging paging;
struct vcpu *vcpu;

2
hypervisor/include/arch/x86/per_cpu.h
View File

@ -29,7 +29,7 @@ struct per_cpu_region {
#endif
struct per_cpu_timers cpu_timers;
struct sched_context sched_ctx;
struct emul_cnx g_inst_ctxt;
struct emul_ctxt g_inst_ctxt;
struct host_gdt gdt;
struct tss_64 tss;
enum cpu_state state;