Changeset 51244 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

May 13, 2014 2:19:15 PM (11 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Relax EFER consistency/corruption checks for the fixes done in r93674.

File:

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

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

@@ -6177 +6177 @@
             case MSR_K8_SF_MASK:        pMixedCtx->msrSFMASK       = pMsr->u64Value;             break;
             case MSR_K8_KERNEL_GS_BASE: pMixedCtx->msrKERNELGSBASE = pMsr->u64Value;             break;
-#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
-            case MSR_K6_EFER:
-            {
-                if (HMVMX_IS_64BIT_HOST_MODE())  /* Nothing to do here since we intercept writes, see hmR0VmxLoadGuestMsrs(). */
-                    break;
-            }
-#endif
+            case MSR_K6_EFER: /* Nothing to do here since we intercept writes, see hmR0VmxLoadGuestMsrs(). */
+                break;
+
             default:
             {
                 AssertMsgFailed(("Unexpected MSR in auto-load/store area. uMsr=%#RX32 cMsrs=%u\n", pMsr->u32Msr, cMsrs));
+                pVCpu->hm.s.u32HMError = pMsr->u32Msr;
                 return VERR_HM_UNEXPECTED_LD_ST_MSR;
             }
@@ -10465 +10462 @@
                     if (hmR0VmxIsAutoLoadStoreGuestMsr(pVCpu, pMixedCtx->ecx))
                     {
-#if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL)
                         /* EFER writes are always intercepted, see hmR0VmxLoadGuestMsrs(). */
-                        if (   HMVMX_IS_64BIT_HOST_MODE()
-                            && pMixedCtx->ecx == MSR_K6_EFER)
+                        if (pMixedCtx->ecx != MSR_K6_EFER)
                         {
-                            break;
+                            AssertMsgFailed(("Unexpected WRMSR for an MSR in the auto-load/store area in the VMCS. ecx=%#RX32\n",
+                                             pMixedCtx->ecx));
+                            HMVMX_RETURN_UNEXPECTED_EXIT();
                         }
-#endif
-                        AssertMsgFailed(("Unexpected WRMSR for an MSR in the auto-load/store area in the VMCS. ecx=%#RX32\n",
-                                         pMixedCtx->ecx));
-                        HMVMX_RETURN_UNEXPECTED_EXIT();
                     }