github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-04-29 04:04:05 +00:00
Code Issues Projects Releases Wiki Activity

uefi: restore cr registers according to efi context

Browse Source 
Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Jason Chen CJ 2018-03-11 22:26:21 +08:00 committed by Jack Ren
parent 189329e0de
commit eed8104f69
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hypervisor/arch/x86/vmx.c
View File

@ -1218,12 +1218,24 @@ static void override_uefi_vmcs(struct vcpu *vcpu)
&vcpu->arch_vcpu.contexts[vcpu->arch_vcpu.cur_context];
if (get_vcpu_mode(vcpu) == PAGE_PROTECTED_MODE) {
cur_context->cr3 = (uint64_t)efi_ctx->cr3 | CR3_PWT;
/* Set up guest CR0 field */
field = VMX_GUEST_CR0;
cur_context->cr0 = efi_ctx->cr0 | CR0_PG | CR0_PE | CR0_NE;
exec_vmwrite(field, cur_context->cr0 & 0xFFFFFFFF);
pr_dbg("VMX_GUEST_CR0: 0x%016llx ", cur_context->cr0);
/* Set up guest CR3 field */
field = VMX_GUEST_CR3;
cur_context->cr3 = efi_ctx->cr3;
exec_vmwrite(field, cur_context->cr3 & 0xFFFFFFFF);
pr_dbg("VMX_GUEST_CR3: 0x%016llx ", cur_context->cr3);
/* Set up guest CR4 field */
field = VMX_GUEST_CR4;
cur_context->cr4 = efi_ctx->cr4 | CR4_VMXE;
exec_vmwrite(field, cur_context->cr4 & 0xFFFFFFFF);
pr_dbg("VMX_GUEST_CR4: 0x%016llx ", cur_context->cr4);
/* Selector */
field = VMX_GUEST_CS_SEL;
exec_vmwrite(field, efi_ctx->cs_sel);