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

Timestamp:

Dec 25, 2018 4:36:48 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:9180 Fix MSR initialization issue for exploding VMX features.

File:

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

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

@@ -224 +224 @@
             uint8_t const uXcptTmp = VMX_ENTRY_INT_INFO_VECTOR((a_pVCpu)->hm.s.Event.u64IntInfo); \
             Log4Func(("Memory operand decoding failed, raising xcpt %#x\n", uXcptTmp)); \
+            NOREF(uXcptTmp); \
             return VINF_SUCCESS; \
         } \
@@ -1127 +1128 @@
  * @param   fEnabledByHost  Set if SUPR0EnableVTx() or similar was used to
  *                          enable VT-x on the host.
- * @param   pvMsrs          Opaque pointer to VMXMSRS struct.
+ * @param   pHwvirtMsrs     Pointer to the hardware-virtualization MSRs.
  */
 VMMR0DECL(int) VMXR0EnableCpu(PHMGLOBALCPUINFO pHostCpu, PVM pVM, void *pvCpuPage, RTHCPHYS HCPhysCpuPage, bool fEnabledByHost,
-                              void *pvMsrs)
+                              PCSUPHWVIRTMSRS pHwvirtMsrs)
 {
     Assert(pHostCpu);
-    Assert(pvMsrs);
+    Assert(pHwvirtMsrs);
     Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
 
@@ -1149 +1150 @@
      * invalidated when flushing by VPID.
      */
-    PVMXMSRS pMsrs = (PVMXMSRS)pvMsrs;
+    PCVMXMSRS pMsrs = &pHwvirtMsrs->u.vmx;
     if (pMsrs->u64EptVpidCaps & MSR_IA32_VMX_EPT_VPID_CAP_INVEPT_ALL_CONTEXTS)
     {