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

Timestamp:

Sep 10, 2013 1:10:41 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Attempt to fix guru in the switcher case with MOV DRx intercepts.

File:

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

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

@@ -2625 +2625 @@
 
         /*
-         * The following should not be set (since we're not in SMM mode):
+         * The following should -not- be set (since we're not in SMM mode):
          * - VMX_VMCS_CTRL_ENTRY_ENTRY_SMM
          * - VMX_VMCS_CTRL_ENTRY_DEACTIVATE_DUALMON
@@ -2632 +2632 @@
         /** @todo VMX_VMCS_CTRL_ENTRY_LOAD_GUEST_PERF_MSR,
          *        VMX_VMCS_CTRL_ENTRY_LOAD_GUEST_PAT_MSR,
-         *  VMX_VMCS_CTRL_ENTRY_LOAD_GUEST_EFER_MSR */
+         *        VMX_VMCS_CTRL_ENTRY_LOAD_GUEST_EFER_MSR */
 
         if ((val & zap) != val)
@@ -3689 +3689 @@
               ("Access bit not set for usable segment. idx=%#x sel=%#x attr %#x\n", idxBase, pSelReg, pSelReg->Attr.u));
 
-    rc = VMXWriteVmcs32(idxAccess, u32Access);           /* 32-bit guest segment access-rights field. */
+    rc = VMXWriteVmcs32(idxAccess, u32Access);              /* 32-bit guest segment access-rights field. */
     AssertRCReturn(rc, rc);
     return rc;
@@ -3997 +3997 @@
     if (pVCpu->hm.s.fContextUseFlags & HM_CHANGED_GUEST_SYSENTER_CS_MSR)
     {
-        rc = VMXWriteVmcs32(VMX_VMCS32_GUEST_SYSENTER_CS,   pMixedCtx->SysEnter.cs);    AssertRCReturn(rc, rc);
+        rc = VMXWriteVmcs32(VMX_VMCS32_GUEST_SYSENTER_CS, pMixedCtx->SysEnter.cs);      AssertRCReturn(rc, rc);
         pVCpu->hm.s.fContextUseFlags &= ~HM_CHANGED_GUEST_SYSENTER_CS_MSR;
     }
@@ -9923 +9923 @@
     HMVMX_VALIDATE_EXIT_HANDLER_PARAMS();
 
-    /* We should -not- get this VM-exit if the guest is debugging. */
+    /* We should -not- get this VM-exit if the guest's debug registers are active. See CPUMR0LoadGuestDebugState(). */
+#if HC_ARCH_BITS == 32 && defined(VBOX_WITH_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
+    if (   !CPUMIsGuestInLongModeEx(pMixedCtx)      /* EFER is always up-to-date. */
+        && CPUMIsGuestDebugStateActive(pVCpu))
+#else
     if (CPUMIsGuestDebugStateActive(pVCpu))
+#endif
     {
         AssertMsgFailed(("Unexpected MOV DRx exit. pVCpu=%p pMixedCtx=%p\n", pVCpu, pMixedCtx));