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

Timestamp:

Sep 6, 2018 4:51:44 AM (6 years ago)

Author:

vboxsync

Message:

VMM/CPUM: Naming nit.

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• CPUMAllMsrs.cpp (modified) (4 diffs)
• IEMAllCImplSvmInstr.cpp.h (modified) (2 diffs)

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

@@ -1883 +1883 @@
     uint64_t uValidatedEfer;
     uint64_t const uOldEfer = pVCpu->cpum.s.Guest.msrEFER;
-    int rc = CPUMQueryValidatedGuestEfer(pVCpu->CTX_SUFF(pVM), pVCpu->cpum.s.Guest.cr0, uOldEfer, uValue, &uValidatedEfer);
+    int rc = CPUMIsGuestEferMsrWriteValid(pVCpu->CTX_SUFF(pVM), pVCpu->cpum.s.Guest.cr0, uOldEfer, uValue, &uValidatedEfer);
     if (RT_FAILURE(rc))
         return VERR_CPUM_RAISE_GP_0;
@@ -6561 +6561 @@
  * @param   uValidEfer  The new, validated EFER MSR value.
  *
- * @remarks One would normally call CPUMQueryValidatedGuestEfer before calling this
- *          function to change the EFER in order to perform an EFER transition.
+ * @remarks One would normally call CPUMIsGuestEferMsrWriteValid() before calling
+ *          this function to change the EFER in order to perform an EFER transition.
  */
 VMMDECL(void) CPUMSetGuestEferMsrNoChecks(PVMCPU pVCpu, uint64_t uOldEfer, uint64_t uValidEfer)
@@ -6607 +6607 @@
 
 /**
- * Validates an EFER MSR write.
+ * Validates an EFER MSR write and provides the new, validated EFER MSR.
  *
  * @returns VBox status code.
@@ -6617 +6617 @@
  *                          this function returns VINF_SUCCESS).
  */
-VMMDECL(int) CPUMQueryValidatedGuestEfer(PVM pVM, uint64_t uCr0, uint64_t uOldEfer, uint64_t uNewEfer, uint64_t *puValidEfer)
+VMMDECL(int) CPUMIsGuestEferMsrWriteValid(PVM pVM, uint64_t uCr0, uint64_t uOldEfer, uint64_t uNewEfer, uint64_t *puValidEfer)
 {
     /* #GP(0) If anything outside the allowed bits is set. */

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

@@ -620 +620 @@
          * Continue validating guest-state and controls.
          *
-         * We pass CR0 as 0 to CPUMQueryValidatedGuestEfer below to skip the illegal
+         * We pass CR0 as 0 to CPUMIsGuestEferMsrWriteValid() below to skip the illegal
          * EFER.LME bit transition check. We pass the nested-guest's EFER as both the
          * old and new EFER value to not have any guest EFER bits influence the new
@@ -626 +626 @@
          */
         uint64_t uValidEfer;
-        rc = CPUMQueryValidatedGuestEfer(pVM, 0 /* CR0 */, pVmcbNstGst->u64EFER, pVmcbNstGst->u64EFER, &uValidEfer);
+        rc = CPUMIsGuestEferMsrWriteValid(pVM, 0 /* CR0 */, pVmcbNstGst->u64EFER, pVmcbNstGst->u64EFER, &uValidEfer);
         if (RT_FAILURE(rc))
         {