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

Timestamp:

Feb 1, 2021 7:13:42 PM (4 years ago)

Author:

vboxsync

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

142540

Message:

VMM/HM: Make a R0 copy of HM::fNestedPaging on setup. Moved pGuestPatchMem and friends down to the patching array. bugref:9217

File:

• trunk/src/VBox/VMM/VMMR3/HM.cpp (modified) (7 diffs)

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

@@ -573 +573 @@
                 && (fCaps & SUPVTCAPS_NESTED_PAGING))
             {
-                pVM->hm.s.fNestedPaging = true;
+                pVM->hm.s.fNestedPagingCfg = true;
                 if (fCaps & SUPVTCAPS_VT_X)
                 {
@@ -584 +584 @@
             }
             else
-                Assert(!pVM->hm.s.fNestedPaging);
+                Assert(!pVM->hm.s.fNestedPagingCfg);
         }
         else
@@ -1586 +1586 @@
      * EPT and unrestricted guest execution are determined in HMR3Init, verify the sanity of that.
      */
-    AssertLogRelReturn(   !pVM->hm.s.fNestedPaging
+    AssertLogRelReturn(   !pVM->hm.s.fNestedPagingCfg
                        || (pVM->hm.s.vmx.Msrs.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_EPT),
                        VERR_HM_IPE_1);
     AssertLogRelReturn(   !pVM->hm.s.vmx.fUnrestrictedGuest
                        || (   (pVM->hm.s.vmx.Msrs.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_UNRESTRICTED_GUEST)
-                           && pVM->hm.s.fNestedPaging),
+                           && pVM->hm.s.fNestedPagingCfg),
                        VERR_HM_IPE_1);
 
@@ -1717 +1717 @@
      * Log configuration details.
      */
-    if (pVM->hm.s.fNestedPaging)
+    if (pVM->hm.s.fNestedPagingCfg)
     {
         LogRel(("HM: Enabled nested paging\n"));
@@ -1841 +1841 @@
      * Nested paging is determined in HMR3Init, verify the sanity of that.
      */
-    AssertLogRelReturn(   !pVM->hm.s.fNestedPaging
+    AssertLogRelReturn(   !pVM->hm.s.fNestedPagingCfg
                        || (pVM->hm.s.svm.fFeaturesForRing3 & X86_CPUID_SVM_FEATURE_EDX_NESTED_PAGING),
                        VERR_HM_IPE_1);
@@ -1895 +1895 @@
     pVM->hm.s.svm.fEnabled = true;
 
-    if (pVM->hm.s.fNestedPaging)
+    if (pVM->hm.s.fNestedPagingCfg)
     {
         LogRel(("HM:   Enabled nested paging\n"));
@@ -2805 +2805 @@
     PVM pVM = pUVM->pVM;
     VM_ASSERT_VALID_EXT_RETURN(pVM, false);
-    return pVM->hm.s.fNestedPaging;
+    return pVM->hm.s.fNestedPagingCfg;
 }