Changeset 52172 in vbox

Timestamp:

Jul 24, 2014 4:11:50 PM (11 years ago)

Author:

vboxsync

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

95219

Message:

VMM/HMVMXR0: Clear inhibit-interrupts force-flag when only NMI blocking is in effect. Don't start VM with NMI-window exiting control set.

File:

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

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

@@ -2456 +2456 @@
     }
 
-    /* If we're using virtual NMIs, we need the NMI-window exiting feature. */
-    if (   (pVCpu->hm.s.vmx.u32PinCtls & VMX_VMCS_CTRL_PIN_EXEC_VIRTUAL_NMI)
-        && (pVM->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_NMI_WINDOW_EXIT))
-    {
-        val |= VMX_VMCS_CTRL_PROC_EXEC_NMI_WINDOW_EXIT;
-    }
-
     /* Use the secondary processor-based VM-execution controls if supported by the CPU. */
     if (pVM->hm.s.vmx.Msrs.VmxProcCtls.n.allowed1 & VMX_VMCS_CTRL_PROC_EXEC_USE_SECONDARY_EXEC_CTRL)
@@ -3504 +3497 @@
 {
     /*
-     * Instructions like STI and MOV SS inhibit interrupts till the next instruction completes. Check if we should
-     * inhibit interrupts or clear any existing interrupt-inhibition.
+     * Check if we should inhibit interrupt delivery due to instructions like STI and MOV SS.
      */
     uint32_t uIntrState = 0;
@@ -6145 +6137 @@
                 Assert(VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS));
             }
+            else if (VMCPU_FF_IS_PENDING(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS))
+                VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_INHIBIT_INTERRUPTS);
 
             if (uIntrState & VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE_BLOCK_NMI)