Changeset 45865 in vbox for trunk/src/VBox/VMM

Timestamp:

May 1, 2013 12:05:16 PM (12 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Assertion and clarified todo comment.

File:

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

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

@@ -5773 +5773 @@
            && !(uIntrState & VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_SMI));
     Assert(!fBlockSti || pMixedCtx->eflags.Bits.u1IF);       /* Cannot set block-by-STI when interrupts are disabled. */
+    Assert(!TRPMHasTrap(pVCpu));
 
     int rc = VINF_SUCCESS;
@@ -6472 +6473 @@
 
     /*
-     * This clears force-flags, TRPM traps & pending HM events. We cannot safely restore the state if we exit to ring-3
-     * (before running guest code) after calling this function (e.g. how do we reverse the effects of calling PDMGetInterrupt()?)
-     * This is why this is done after all possible exits-to-ring-3 paths in this code.
+     * Evaluates and injects any pending events, toggling force-flags and updating the guest-interruptibility
+     * state (interrupt shadow) in the VMCS. This -can- potentially be reworked to be done before disabling
+     * interrupts and handle returning to ring-3 afterwards, but requires very careful state restoration.
      */
-    /** @todo r=bird: You reverse the effect of calling PDMGetInterrupt by
-     *        handing it over to TPRM like we do in REMR3StateBack using
-     *        TRPMAssertTrap and the other setters. */
+    /** @todo Rework event evaluation and injection to be complete separate. */
     rc = hmR0VmxInjectPendingEvent(pVCpu, pMixedCtx);
     AssertRCReturn(rc, rc);