Changeset 10716 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

Jul 17, 2008 7:31:03 AM (17 years ago)

Author:

vboxsync

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

33441

Message:

TPR fix for VT-x

File:

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

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

@@ -911 +911 @@
     if (pVM->hwaccm.s.fContextUseFlags & HWACCM_CHANGED_GUEST_DEBUG)
     {
-        /** @todo DR0-6 */
-        val  = pCtx->dr7;
+        val  = pCtx->dr7 & 0xffffffff;                                  /* upper 32 bits reserved */
         val &= ~(RT_BIT(11) | RT_BIT(12) | RT_BIT(14) | RT_BIT(15));    /* must be zero */
-        val |= 0x400;                                       /* must be one */
-#ifdef VBOX_STRICT
-        val = 0x400;
-#endif
+        val |= 0x400;                                                   /* must be one */
         rc |= VMXWriteVMCS(VMX_VMCS_GUEST_DR7,              val);
         AssertRC(rc);
@@ -926 +922 @@
         AssertRC(rc);
 
-        /** @todo */
+        /** @todo do we really ever need this? */
         rc |= VMXWriteVMCS(VMX_VMCS_GUEST_DEBUG_EXCEPTIONS,         0);
         AssertRC(rc);
@@ -1437 +1433 @@
     pCtx->eflags.u32        = val;
 
-    /* Update the APIC with the cached TPR value.
-     * @todo reduce overhead
-     */
-    if (    pCtx->msrEFER & MSR_K6_EFER_LMA
-        &&  pVM->hwaccm.s.vmx.pAPIC)
-    {
-        rc = PDMApicSetTPR(pVM, pVM->hwaccm.s.vmx.pAPIC[0x80] >> 4);
-        AssertRC(rc);
-    }
-
     /* Take care of instruction fusing (sti, mov ss) */
     rc |= VMXReadVMCS(VMX_VMCS_GUEST_INTERRUPTIBILITY_STATE, &val);
@@ -1533 +1519 @@
     if (fSyncTPR)
     {
-        rc = PDMApicSetTPR(pVM, pVM->hwaccm.s.vmx.pAPIC[0x80]);
+        rc = PDMApicSetTPR(pVM, pVM->hwaccm.s.vmx.pAPIC[0x80] >> 4);
         AssertRC(rc);
     }