Changeset 45547 in vbox for trunk/src

Timestamp:

Apr 14, 2013 8:45:07 PM (12 years ago)

Author:

vboxsync

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

85031

Message:

VMM/VMMR0: More vectoring event fun.

File:

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

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

@@ -4649 +4649 @@
 
 /**
- * Determines if we are intercepting any contributory exceptions or page-faults.
+ * Determines if we are intercepting any contributory exceptions.
  *
  * @returns true if we are intercepting them, false otherwise.
  * @param   pVCpu       Pointer to the VMCPU.
  */
-DECLINLINE(bool) hmR0VmxInterceptingContributoryXcptsOrPF(PVMCPU pVCpu)
-{
-    if (pVCpu->hm.s.vmx.u32XcptBitmap & (VMX_CONTRIBUTORY_XCPT_BITMAP | RT_BIT(X86_XCPT_PF)))
+DECLINLINE(bool) hmR0VmxInterceptingContributoryXcpts(PVMCPU pVCpu)
+{
+    if (pVCpu->hm.s.vmx.u32XcptBitmap & VMX_CONTRIBUTORY_XCPT_BITMAP)
         return true;
     return false;
@@ -4759 +4759 @@
                 enmReflect = VMXREFLECTXCPT_XCPT;
             }
-            else if (   hmR0VmxIsContributoryXcpt(uIdtVector)
-                     && hmR0VmxIsContributoryXcpt(uExitVector))
-            {
-                enmReflect = VMXREFLECTXCPT_DF;
-            }
-            else if (   hmR0VmxInterceptingContributoryXcptsOrPF(pVCpu)
-                     && uIdtVector == X86_XCPT_PF
-                     && (   hmR0VmxIsContributoryXcpt(uExitVector)
-                         || uExitVector == X86_XCPT_PF))
+            else if (   hmR0VmxInterceptingContributoryXcpts(pVCpu)
+                     && hmR0VmxIsContributoryXcpt(uExitVector)
+                     && (   hmR0VmxIsContributoryXcpt(uIdtVector)
+                         || uIdtVector == X86_XCPT_PF))
             {
                 enmReflect = VMXREFLECTXCPT_DF;