Changeset 70732 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jan 25, 2018 4:50:36 AM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120487

Message:

VMM: Move fGif out of svm and into common nested hwvirt struct.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (7 diffs)
• EM.cpp (modified) (1 diff)

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

@@ -752 +752 @@
 
 /**
- * Frees memory allocated by cpumR3AllocHwVirtState().
+ * Frees memory allocated for the SVM hardware virtualization state.
  *
  * @param   pVM     The cross context VM structure.
  */
-static void cpumR3FreeHwVirtState(PVM pVM)
+static void cpumR3FreeSvmHwVirtState(PVM pVM)
 {
     Assert(pVM->cpum.ro.GuestFeatures.fSvm);
@@ -785 +785 @@
 
 /**
- * Allocates memory required by the hardware virtualization state.
+ * Allocates memory for the SVM hardware virtualization state.
  *
  * @returns VBox status code.
  * @param   pVM     The cross context VM structure.
  */
-static int cpumR3AllocHwVirtState(PVM pVM)
+static int cpumR3AllocSvmHwVirtState(PVM pVM)
 {
     Assert(pVM->cpum.ro.GuestFeatures.fSvm);
@@ -850 +850 @@
     /* On any failure, cleanup. */
     if (RT_FAILURE(rc))
-        cpumR3FreeHwVirtState(pVM);
+        cpumR3FreeSvmHwVirtState(pVM);
 
     return rc;
@@ -1039 +1039 @@
     if (pVM->cpum.ro.GuestFeatures.fSvm)
     {
-        rc = cpumR3AllocHwVirtState(pVM);
+        rc = cpumR3AllocSvmHwVirtState(pVM);
         if (RT_FAILURE(rc))
             return rc;
@@ -1126 +1126 @@
 
     if (pVM->cpum.ro.GuestFeatures.fSvm)
-        cpumR3FreeHwVirtState(pVM);
+        cpumR3FreeSvmHwVirtState(pVM);
     return VINF_SUCCESS;
 }
@@ -1282 +1282 @@
      * Hardware virtualization state.
      */
+    pCtx->hwvirt.fGif = 1;
+
     /* SVM. */
     if (pCtx->hwvirt.svm.CTX_SUFF(pVmcb))
+    {
         memset(pCtx->hwvirt.svm.CTX_SUFF(pVmcb), 0, SVM_VMCB_PAGES << PAGE_SHIFT);
-    pCtx->hwvirt.svm.uMsrHSavePa = 0;
-    pCtx->hwvirt.svm.GCPhysVmcb = 0;
-    pCtx->hwvirt.svm.fGif = 1;
+        pCtx->hwvirt.svm.uMsrHSavePa = 0;
+        pCtx->hwvirt.svm.GCPhysVmcb = 0;
+    }
 }
 
@@ -2456 +2459 @@
         pHlp->pfnPrintf(pHlp, "    idtr                       = %016RX64:%04x\n", pCtx->hwvirt.svm.HostState.idtr.pIdt,
                         pCtx->hwvirt.svm.HostState.idtr.cbIdt);
-        pHlp->pfnPrintf(pHlp, "  fGif                       = %u\n",        pCtx->hwvirt.svm.fGif);
+        pHlp->pfnPrintf(pHlp, "  fGif                       = %u\n",        pCtx->hwvirt.fGif);
         pHlp->pfnPrintf(pHlp, "  cPauseFilter               = %RU16\n",     pCtx->hwvirt.svm.cPauseFilter);
         pHlp->pfnPrintf(pHlp, "  cPauseFilterThreshold      = %RU32\n",     pCtx->hwvirt.svm.cPauseFilterThreshold);

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

@@ -1960 +1960 @@
             {
                 PCPUMCTX pCtx = pVCpu->em.s.pCtx;
-                bool fGif     = pCtx->hwvirt.svm.fGif;
+                bool fGif     = pCtx->hwvirt.fGif;
 #ifdef VBOX_WITH_RAW_MODE
                 /* We cannot just inspect EFLAGS when nested hw.virt is enabled (see e.g. CPUMCanSvmNstGstTakePhysIntr). */