Changeset 45590 in vbox for trunk/src

Timestamp:

Apr 17, 2013 4:31:27 PM (12 years ago)

Author:

vboxsync

Message:

VMMR0/HMVMXR0: reflect #DE and others back to the guest on a vectoring #PF. This case is not covered by the Intel manuals.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -4711 +4711 @@
         if (uIntType == VMX_IDT_VECTORING_INFO_TYPE_HW_XCPT)
         {
-            if (   hmR0VmxIsBenignXcpt(uIdtVector)
-                || hmR0VmxIsBenignXcpt(uExitVector))
-            {
-                enmReflect = VMXREFLECTXCPT_XCPT;
-            }
-            else if (   hmR0VmxIsContributoryXcpt(uIdtVector)
+            enmReflect = VMXREFLECTXCPT_XCPT;
+            if (   hmR0VmxIsContributoryXcpt(uIdtVector)
                      && uExitVector == X86_XCPT_PF)
             {
-                enmReflect = VMXREFLECTXCPT_XCPT;
                 GCPtrFaultAddress = pMixedCtx->cr2;
                 Log(("IDT: Contributory #PF uCR2=%#RGv\n", pMixedCtx->cr2));
@@ -4727 +4722 @@
             {
                 pVmxTransient->fVectoringPF = true;
-                enmReflect = VMXREFLECTXCPT_XCPT;
                 GCPtrFaultAddress = pMixedCtx->cr2;
                 Log(("IDT: Vectoring #PF uCR2=%#RGv\n", pMixedCtx->cr2));
@@ -4740 +4734 @@
             else if (uIdtVector == X86_XCPT_DF)
                 enmReflect = VMXREFLECTXCPT_TF;
-            else
-                AssertMsgFailed(("Invalid!\n"));
         }
         else if (   uIntType != VMX_IDT_VECTORING_INFO_TYPE_SW_INT
@@ -5238 +5230 @@
 
     rc |= VMXReadVmcs32(idxAccess, &u32Val);
-    pSelReg->Attr.u  = u32Val;
+    pSelReg->Attr.u = u32Val;
     AssertRCReturn(rc, rc);
 
@@ -7661 +7653 @@
             && pMixedCtx->ecx <= MSR_IA32_X2APIC_END)
         {
+            Assert(pVCpu->hm.s.vmx.fUpdatedGuestState & VMX_UPDATED_GUEST_APIC_STATE);
             pVCpu->hm.s.fContextUseFlags |= HM_CHANGED_VMX_GUEST_APIC_STATE;
         }
@@ -8320 +8313 @@
     PVM pVM = pVCpu->CTX_SUFF(pVM);
     VBOXSTRICTRC rc2 = PGMR0Trap0eHandlerNPMisconfig(pVM, pVCpu, PGMMODE_EPT, CPUMCTX2CORE(pMixedCtx), GCPhys, UINT32_MAX);
+    rc = VBOXSTRICTRC_VAL(rc2);
     Log(("EPT misconfig at %#RX64 RIP=%#RX64 rc=%d\n", GCPhys, pMixedCtx->rip, rc));
-    rc = VBOXSTRICTRC_VAL(rc2);
     if (   rc == VINF_SUCCESS
         || rc == VERR_PAGE_TABLE_NOT_PRESENT