Changeset 52162 in vbox

Timestamp:

Jul 24, 2014 11:28:58 AM (11 years ago)

Author:

vboxsync

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

95204

Message:

VMM/HMVMXR0: Make hmR0VmxGetGuestIntrState() side-effect free in terms of force-flags.

File:

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

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

@@ -3500 +3500 @@
  *
  * @remarks No-long-jump zone!!!
- * @remarks Has side-effects with VMCPU_FF_INHIBIT_INTERRUPTS force-flag.
  */
 DECLINLINE(uint32_t) hmR0VmxGetGuestIntrState(PVMCPU pVCpu, PCPUMCTX pMixedCtx)
@@ -3514 +3513 @@
         AssertMsg(HMVMXCPU_GST_IS_SET(pVCpu, HMVMX_UPDATED_GUEST_RIP | HMVMX_UPDATED_GUEST_RFLAGS),
                   ("%#x\n", HMVMXCPU_GST_VALUE(pVCpu)));
-        if (pMixedCtx->rip != EMGetInhibitInterruptsPC(pVCpu))
-        {
-            /*
-             * We can clear the inhibit force flag as even if we go back to the recompiler without executing guest code in
-             * VT-x, the flag's condition to be cleared is met and thus the cleared state is correct.
-             */
-            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
-        }
-        else if (pMixedCtx->eflags.Bits.u1IF)
-            uIntrState = VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_STI;
-        else
-            uIntrState = VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_MOVSS;
+        if (pMixedCtx->rip == EMGetInhibitInterruptsPC(pVCpu))
+        {
+            if (pMixedCtx->eflags.Bits.u1IF)
+                uIntrState = VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_STI;
+            else
+                uIntrState = VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_MOVSS;
+        }
+        /* else: Although we can clear the force-flag here, let's keep this side-effects free. */
     }
 
@@ -6887 +6882 @@
     else if (enmTrpmEvent == TRPM_HARDWARE_INT)
     {
-        /** @todo r=ramshankar: Make this a strict-build assert after this bug is
-         *        fixed. See @bugref{7317}. */
+#ifdef VBOX_STRICT
         uint32_t uEFlags = CPUMGetGuestEFlags(pVCpu);
         if (!(uEFlags & X86_EFL_IF))
@@ -6895 +6889 @@
             return VERR_VMX_IPE_5;
         }
-
+#endif
         u32IntInfo |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_EXT_INT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);
     }