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

Timestamp:

Oct 17, 2013 7:30:41 AM (12 years ago)

Author:

vboxsync

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

90012

Message:

HMR0VMX.cpp: Clear the TF bit in the single step loop, instead on later in the common exit-to-ring3 code.

File:

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

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

@@ -6423 +6423 @@
     }
 
-    /*
-     * Clear the X86_EFL_TF if necessary.
-     */
-    if (pVCpu->hm.s.fClearTrapFlag)
-    {
-        Assert(pVCpu->hm.s.vmx.fUpdatedGuestState & HMVMX_UPDATED_GUEST_RFLAGS);
-        pMixedCtx->eflags.Bits.u1TF = 0;
-        pVCpu->hm.s.fClearTrapFlag = false;
-    }
-    /** @todo there seems to be issues with the resume flag when the monitor trap
-     *        flag is pending without being used. Seen early in bios init when
-     *        accessing APIC page in prot mode. */
+    Assert(!pVCpu->hm.s.fClearTrapFlag);
 
     /* On our way back from ring-3 reload the guest state if there is a possibility of it being changed. */
@@ -7984 +7973 @@
         VMCPU_HMCF_SET(pVCpu, HM_CHANGED_GUEST_DEBUG);
     }
+
+    /*
+     * Clear the X86_EFL_TF if necessary.
+     */
+    if (pVCpu->hm.s.fClearTrapFlag)
+    {
+        int rc2 = hmR0VmxSaveGuestRflags(pVCpu, pCtx);
+        AssertRCReturn(rc2, rc2);
+        pVCpu->hm.s.fClearTrapFlag = false;
+        pCtx->eflags.Bits.u1TF = 0;
+    }
+    /** @todo there seems to be issues with the resume flag when the monitor trap
+     *        flag is pending without being used. Seen early in bios init when
+     *        accessing APIC page in prot mode. */
 
     STAM_PROFILE_ADV_STOP(&pVCpu->hm.s.StatEntry, x);