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

Timestamp:

May 3, 2019 8:21:44 AM (6 years ago)

Author:

vboxsync

Message:

VMM: Move VT-x/AMD-V helpers that are based on CPU specs to CPUM in preparation of upcoming changes. It is better placed in CPUM if say NEM in future needs to implement nested VT-x/AMD-V.

File:

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

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

@@ -1550 +1550 @@
  *                          include both a read -and- a write permission!
  *
- * @sa      HMGetVmxMsrPermission.
+ * @sa      CPUMGetVmxMsrPermission.
  * @remarks Can be called with interrupts disabled.
  */
@@ -2207 +2207 @@
         if (pVmcsInfo->u32ProcCtls & VMX_PROC_CTLS_USE_MSR_BITMAPS)
         {
-            uint32_t const fMsrpm = HMGetVmxMsrPermission(pVmcsInfo->pvMsrBitmap, pGuestMsrLoad->u32Msr);
+            uint32_t const fMsrpm = CPUMGetVmxMsrPermission(pVmcsInfo->pvMsrBitmap, pGuestMsrLoad->u32Msr);
             if (fIsEferMsr)
             {
@@ -2905 +2905 @@
 #ifdef VBOX_STRICT
     Assert(pVmcsInfo->pvMsrBitmap);
-    uint32_t const fMsrpmEfer = HMGetVmxMsrPermission(pVmcsInfo->pvMsrBitmap, MSR_K6_EFER);
+    uint32_t const fMsrpmEfer = CPUMGetVmxMsrPermission(pVmcsInfo->pvMsrBitmap, MSR_K6_EFER);
     Assert(fMsrpmEfer == VMXMSRPM_EXIT_RD_WR);
 #endif
@@ -10839 +10839 @@
  * @param   pcLoops     Pointer to the number of executed loops.
  *
- * @sa      hmR0VmxRunGuestCodeNormal().
+ * @sa      hmR0VmxRunGuestCodeNormal.
  */
 static VBOXSTRICTRC hmR0VmxRunGuestCodeNested(PVMCPU pVCpu, uint32_t *pcLoops)
@@ -13671 +13671 @@
         {
             Assert(pVmcsInfo->pvMsrBitmap);
-            uint32_t fMsrpm = HMGetVmxMsrPermission(pVmcsInfo->pvMsrBitmap, idMsr);
+            uint32_t fMsrpm = CPUMGetVmxMsrPermission(pVmcsInfo->pvMsrBitmap, idMsr);
             if (fMsrpm & VMXMSRPM_ALLOW_RD)
             {
@@ -13816 +13816 @@
                     {
                         Assert(pVmcsInfo->pvMsrBitmap);
-                        uint32_t fMsrpm = HMGetVmxMsrPermission(pVmcsInfo->pvMsrBitmap, idMsr);
+                        uint32_t fMsrpm = CPUMGetVmxMsrPermission(pVmcsInfo->pvMsrBitmap, idMsr);
                         if (fMsrpm & VMXMSRPM_ALLOW_WR)
                         {
@@ -14870 +14870 @@
  * Hacks its way around the lovely mesa driver's backdoor accesses.
  *
- * @sa hmR0SvmHandleMesaDrvGp
+ * @sa hmR0SvmHandleMesaDrvGp.
  */
 static int hmR0VmxHandleMesaDrvGp(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient, PCPUMCTX pCtx)
@@ -14890 +14890 @@
  *
  * @returns true if it is, false if it isn't.
- * @sa      hmR0SvmIsMesaDrvGp
+ * @sa      hmR0SvmIsMesaDrvGp.
  */
 DECLINLINE(bool) hmR0VmxIsMesaDrvGp(PVMCPU pVCpu, PVMXTRANSIENT pVmxTransient, PCPUMCTX pCtx)