Changeset 45545 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Apr 14, 2013 5:06:58 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

85028

Message:

VMM/VMMR0: Fixes to vectoring #PF, and reflecting exceptions to the guest.

File:

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

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

@@ -4726 +4726 @@
 {
     int rc = hmR0VmxReadIdtVectoringInfoVmcs(pVmxTransient);
-    AssertRCReturn(rc, rc);
+    AssertRC(rc);
     if (VMX_IDT_VECTORING_INFO_VALID(pVmxTransient->uIdtVectoringInfo))
     {
@@ -4749 +4749 @@
         {
             if (   hmR0VmxIsBenignXcpt(uIdtVector)
-                || hmR0VmxIsBenignXcpt(uExitVector)
-                || (   hmR0VmxIsContributoryXcpt(uIdtVector)
-                    && uExitVector == X86_XCPT_PF))
+                || hmR0VmxIsBenignXcpt(uExitVector))
             {
                 enmReflect = VMXREFLECTXCPT_XCPT;
             }
-            else if (   (pVCpu->hm.s.vmx.u32XcptBitmap & RT_BIT(X86_XCPT_PF))
-                     && uIdtVector == X86_XCPT_PF
-                     && uExitVector == X86_XCPT_PF)
+            else if (   uExitVector == X86_XCPT_PF
+                     && (   hmR0VmxIsContributoryXcpt(uIdtVector)
+                         || uIdtVector == X86_XCPT_PF))
             {
                 pVmxTransient->fVectoringPF = true;
@@ -4768 +4766 @@
             else if (   hmR0VmxInterceptingContributoryXcptsOrPF(pVCpu)
                      && uIdtVector == X86_XCPT_PF
-                     && hmR0VmxIsContributoryXcpt(uExitVector))
+                     && (   hmR0VmxIsContributoryXcpt(uExitVector)
+                         || uExitVector == X86_XCPT_PF))
             {
                 enmReflect = VMXREFLECTXCPT_DF;
@@ -4821 +4820 @@
             }
 
-            default:    /* shut up gcc. */
+            default:
+                Assert(rc == VINF_SUCCESS);
                 break;
         }