Changeset 80146 in vbox for trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h

Timestamp:

Aug 6, 2019 4:27:32 AM (5 years ago)

Author:

vboxsync

Message:

VMM/IEM: Nested VMX: bugref:9180 Naming nit.

File:

• trunk/src/VBox/VMM/VMMAll/IEMAllCImplVmxInstr.cpp.h (modified) (7 diffs)

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

@@ -1488 +1488 @@
         &&  uExitReason != VMX_EXIT_SMI
         &&  uExitReason != VMX_EXIT_ERR_MACHINE_CHECK
-        && !HMVmxIsVmexitTrapLike(uExitReason))
+        && !VMXIsVmexitTrapLike(uExitReason))
     {
         /** @todo NSTVMX: also must exclude VM-exits caused by debug exceptions when
@@ -6030 +6030 @@
         uint8_t const uRsvd   = RT_BF_GET(uIntInfo, VMX_BF_ENTRY_INT_INFO_RSVD_12_30);
         if (   !uRsvd
-            && HMVmxIsEntryIntInfoTypeValid(IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fVmxMonitorTrapFlag, uType)
-            && HMVmxIsEntryIntInfoVectorValid(uVector, uType))
+            && VMXIsEntryIntInfoTypeValid(IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fVmxMonitorTrapFlag, uType)
+            && VMXIsEntryIntInfoVectorValid(uVector, uType))
         { /* likely */ }
         else
@@ -6761 +6761 @@
      * See Intel spec. 26.6.1 "Interruptibility State".
      */
-    bool const fEntryVectoring = HMVmxIsVmentryVectoring(pVmcs->u32EntryIntInfo, NULL /* puEntryIntInfoType */);
+    bool const fEntryVectoring = VMXIsVmentryVectoring(pVmcs->u32EntryIntInfo, NULL /* puEntryIntInfoType */);
     if (   !fEntryVectoring
         && (pVmcs->u32GuestIntrState & (VMX_VMCS_GUEST_INT_STATE_BLOCK_STI | VMX_VMCS_GUEST_INT_STATE_BLOCK_MOVSS)))
@@ -6850 +6850 @@
     {
         uint8_t uEntryIntInfoType;
-        bool const fEntryVectoring = HMVmxIsVmentryVectoring(pVmcs->u32EntryIntInfo, &uEntryIntInfoType);
+        bool const fEntryVectoring = VMXIsVmentryVectoring(pVmcs->u32EntryIntInfo, &uEntryIntInfoType);
         if (fEntryVectoring)
         {
@@ -7472 +7472 @@
     uint8_t const *pbVmcs    = (uint8_t const *)pVmcs;
     uint8_t const *pbField   = pbVmcs + offField;
-    uint8_t const  uEffWidth = HMVmxGetVmcsFieldWidthEff(VmcsField.u);
+    uint8_t const  uEffWidth = VMXGetVmcsFieldWidthEff(VmcsField.u);
     switch (uEffWidth)
     {
@@ -7701 +7701 @@
     uint8_t      *pbVmcs    = (uint8_t *)pVmcs;
     uint8_t      *pbField   = pbVmcs + offField;
-    uint8_t const uEffWidth = HMVmxGetVmcsFieldWidthEff(VmcsField.u);
+    uint8_t const uEffWidth = VMXGetVmcsFieldWidthEff(VmcsField.u);
     switch (uEffWidth)
     {
@@ -7815 +7815 @@
 
     /* Read-only VMCS field. */
-    bool const fIsFieldReadOnly = HMVmxIsVmcsFieldReadOnly(u64VmcsField);
+    bool const fIsFieldReadOnly = VMXIsVmcsFieldReadOnly(u64VmcsField);
     if (   !fIsFieldReadOnly
         ||  IEM_GET_GUEST_CPU_FEATURES(pVCpu)->fVmxVmwriteAll)