Changeset 76002 in vbox for trunk/src

Timestamp:

Dec 6, 2018 8:47:23 AM (6 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Clear MTF on VM-exit. Also APIC-write emulation does not need APIC-register virtualization features. It also happens for VTPR.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -3058 +3058 @@
      * check for it here.
      */
+
+    /* Clear the force-flag indicating that monitor-trap flag is no longer active. */
+    VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_VMX_PREEMPT_TIMER);
+
+    /* Cause the MTF VM-exit. The VM-exit qualification MBZ. */
     iemVmxVmcsSetExitQual(pVCpu, 0);
     return iemVmxVmexit(pVCpu, VMX_EXIT_MTF);
@@ -3772 +3777 @@
                 pVmcs->u32PreemptTimer = 0;
 
+            /* Clear the force-flag indicating the VMX-preemption timer no longer active. */
+            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_VMX_PREEMPT_TIMER);
+
             /* Cause the VMX-preemption timer VM-exit. The VM-exit qualification MBZ. */
             iemVmxVmcsSetExitQual(pVCpu, 0);
-            VMCPU_FF_CLEAR(pVCpu, VMCPU_FF_VMX_PREEMPT_TIMER);
             return iemVmxVmexit(pVCpu, VMX_EXIT_PREEMPT_TIMER);
         }
@@ -4913 +4920 @@
     PCVMXVVMCS pVmcs = pVCpu->cpum.GstCtx.hwvirt.vmx.CTX_SUFF(pVmcs);
     Assert(pVmcs);
-    Assert(pVmcs->u32ProcCtls2 & VMX_PROC_CTLS2_APIC_REG_VIRT);
 
     /*