Changeset 104512 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

May 3, 2024 3:08:25 PM (10 months ago)

Author:

vboxsync

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

163035

Message:

VMM/HM: Simplified the GCM #DE interception handling. bugref:9735 bugref:10683

File:

• trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/VMXAllTemplate.cpp.h ¶

@@ -7548 +7548 @@
     AssertRCReturn(rc, rc);
 
-    VBOXSTRICTRC rcStrict = VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE;
     if (VCPU_2_VMXSTATE(pVCpu).fGCMTrapXcptDE)
     {
-        rcStrict = GCMXcptDE(pVCpu, &pVCpu->cpum.GstCtx);
-        Assert(rcStrict == VINF_SUCCESS /* restart instr */ || rcStrict == VERR_NOT_FOUND /* deliver exception */);
-    }
-    /** @todo r=bird: This cannot be right! It'll suppress \#DE   */
+        rc = GCMXcptDE(pVCpu, &pVCpu->cpum.GstCtx);
+        Assert(rc == VINF_SUCCESS /* restart instr */ || rc == VERR_NOT_FOUND /* deliver exception */);
+    }
     else
-        rcStrict = VINF_SUCCESS;        /* Do nothing. */
+        rc = VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE;
 
     /* If the GCM #DE exception handler didn't succeed or wasn't needed, raise #DE. */
-    if (RT_FAILURE(rcStrict))
-    {
+    if (RT_FAILURE(rc))
         vmxHCSetPendingEvent(pVCpu, VMX_ENTRY_INT_INFO_FROM_EXIT_INT_INFO(pVmxTransient->uExitIntInfo),
-                               pVmxTransient->cbExitInstr, pVmxTransient->uExitIntErrorCode, 0 /* GCPtrFaultAddress */);
-        rcStrict = VINF_SUCCESS;
-    }
-
-    /** @todo r=bird: This assertion is wrong. rcStrict can never be
-     *        VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE here, it can only be
-     *        VINF_SUCCESS. */
-    Assert(rcStrict == VINF_SUCCESS || rcStrict == VERR_VMX_UNEXPECTED_INTERRUPTION_EXIT_TYPE);
-    return VBOXSTRICTRC_VAL(rcStrict);
+                             pVmxTransient->cbExitInstr, pVmxTransient->uExitIntErrorCode, 0 /* GCPtrFaultAddress */);
+    return VINF_SUCCESS;
 }