Changeset 91971 in vbox

Timestamp:

Oct 21, 2021 3:58:30 PM (3 years ago)

Author:

vboxsync

Message:

VMM: Nested VMX: bugref:10092 Renamed typo in VMCS field.

Location:

trunk

Files:

• include/VBox/vmm/hm_vmx.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/HMVMXAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (5 diffs)
• src/VBox/VMM/VMMR3/CPUM.cpp (modified) (2 diffs)

trunk/include/VBox/vmm/hm_vmx.h

@@ -3851 +3851 @@
     RTUINT64U       u64AddrPostedIntDesc;        /**< 0x2b0 - Posted-interrupt descriptor address. */
     RTUINT64U       u64VmFuncCtls;               /**< 0x2b8 - VM-functions control. */
-    RTUINT64U       u64EptpPtr;                  /**< 0x2c0 - EPTP pointer. */
+    RTUINT64U       u64EptPtr;                   /**< 0x2c0 - EPT pointer. */
     RTUINT64U       u64EoiExitBitmap0;           /**< 0x2c8 - EOI-exit bitmap 0. */
     RTUINT64U       u64EoiExitBitmap1;           /**< 0x2d0 - EOI-exit bitmap 1. */

trunk/src/VBox/VMM/VMMAll/HMVMXAll.cpp

@@ -926 +926 @@
         LogRel(("  %sPosted-intr desc addr      = %#RX64\n",   pszPrefix, pVmcs->u64AddrPostedIntDesc.u));
         LogRel(("  %sVM-functions control       = %#RX64\n",   pszPrefix, pVmcs->u64VmFuncCtls.u));
-        LogRel(("  %sEPTP ptr                   = %#RX64\n",   pszPrefix, pVmcs->u64EptpPtr.u));
+        LogRel(("  %sEPTP ptr                   = %#RX64\n",   pszPrefix, pVmcs->u64EptPtr.u));
         LogRel(("  %sEOI-exit bitmap 0          = %#RX64\n",   pszPrefix, pVmcs->u64EoiExitBitmap0.u));
         LogRel(("  %sEOI-exit bitmap 1          = %#RX64\n",   pszPrefix, pVmcs->u64EoiExitBitmap1.u));

trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

@@ -254 +254 @@
         /*    11 */ RT_UOFFSETOF(VMXVVMCS, u64AddrPostedIntDesc),
         /*    12 */ RT_UOFFSETOF(VMXVVMCS, u64VmFuncCtls),
-        /*    13 */ RT_UOFFSETOF(VMXVVMCS, u64EptpPtr),
+        /*    13 */ RT_UOFFSETOF(VMXVVMCS, u64EptPtr),
         /*    14 */ RT_UOFFSETOF(VMXVVMCS, u64EoiExitBitmap0),
         /*    15 */ RT_UOFFSETOF(VMXVVMCS, u64EoiExitBitmap1),
@@ -6100 +6100 @@
             uint8_t const cMaxPhysAddrWidth = IEM_GET_GUEST_CPU_FEATURES(pVCpu)->cMaxPhysAddrWidth;
             uint64_t const fValidMask       = VMX_EPTP_VALID_MASK & ~(UINT64_MAX << cMaxPhysAddrWidth);
-            if (pVmcs->u64EptpPtr.u & fValidMask)
+            if (pVmcs->u64EptPtr.u & fValidMask)
             { /* likely */ }
             else
@@ -6107 +6107 @@
             /* Memory Type. */
             uint64_t const fCaps    = pVCpu->cpum.GstCtx.hwvirt.vmx.Msrs.u64EptVpidCaps;
-            uint8_t const  fMemType = RT_BF_GET(pVmcs->u64EptpPtr.u, VMX_BF_EPTP_MEMTYPE);
+            uint8_t const  fMemType = RT_BF_GET(pVmcs->u64EptPtr.u, VMX_BF_EPTP_MEMTYPE);
             if (   (   fMemType == VMX_EPTP_MEMTYPE_WB
                     && RT_BF_GET(fCaps, VMX_BF_EPT_VPID_CAP_MEMTYPE_WB))
@@ -6123 +6123 @@
              */
             Assert(RT_BF_GET(fCaps, VMX_BF_EPT_VPID_CAP_PAGE_WALK_LENGTH_4));
-            if (RT_BF_GET(pVmcs->u64EptpPtr.u, VMX_BF_EPTP_PAGE_WALK_LENGTH) == 3)
+            if (RT_BF_GET(pVmcs->u64EptPtr.u, VMX_BF_EPTP_PAGE_WALK_LENGTH) == 3)
             { /* likely */ }
             else
@@ -6129 +6129 @@
 
             /* Access and dirty bits support in EPT structures. */
-            if (   !RT_BF_GET(pVmcs->u64EptpPtr.u, VMX_BF_EPTP_ACCESS_DIRTY)
+            if (   !RT_BF_GET(pVmcs->u64EptPtr.u, VMX_BF_EPTP_ACCESS_DIRTY)
                 ||  RT_BF_GET(fCaps, VMX_BF_EPT_VPID_CAP_ACCESS_DIRTY))
             { /* likely */ }

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -397 +397 @@
     SSMFIELD_ENTRY(       VMXVVMCS, u64AddrPostedIntDesc),
     SSMFIELD_ENTRY(       VMXVVMCS, u64VmFuncCtls),
-    SSMFIELD_ENTRY(       VMXVVMCS, u64EptpPtr),
+    SSMFIELD_ENTRY(       VMXVVMCS, u64EptPtr),
     SSMFIELD_ENTRY(       VMXVVMCS, u64EoiExitBitmap0),
     SSMFIELD_ENTRY(       VMXVVMCS, u64EoiExitBitmap1),
@@ -3677 +3677 @@
         pHlp->pfnPrintf(pHlp, "  %sPosted-intr desc addr      = %#RX64\n",   pszPrefix, pVmcs->u64AddrPostedIntDesc.u);
         pHlp->pfnPrintf(pHlp, "  %sVM-functions control       = %#RX64\n",   pszPrefix, pVmcs->u64VmFuncCtls.u);
-        pHlp->pfnPrintf(pHlp, "  %sEPTP ptr                   = %#RX64\n",   pszPrefix, pVmcs->u64EptpPtr.u);
+        pHlp->pfnPrintf(pHlp, "  %sEPTP ptr                   = %#RX64\n",   pszPrefix, pVmcs->u64EptPtr.u);
         pHlp->pfnPrintf(pHlp, "  %sEOI-exit bitmap 0          = %#RX64\n",   pszPrefix, pVmcs->u64EoiExitBitmap0.u);
         pHlp->pfnPrintf(pHlp, "  %sEOI-exit bitmap 1          = %#RX64\n",   pszPrefix, pVmcs->u64EoiExitBitmap1.u);