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

Timestamp:

Feb 2, 2021 5:33:49 PM (4 years ago)

Author:

vboxsync

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

142573

Message:

VMM/HMVMX: Moved fUnrestrictedGuest member from HM::vmx to HMR0PERVM::vmx. bugref:9217

File:

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

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

@@ -578 +578 @@
                     if (   fAllowUnrestricted
                         && (fCaps & SUPVTCAPS_VTX_UNRESTRICTED_GUEST))
-                        pVM->hm.s.vmx.fUnrestrictedGuest = true;
+                        pVM->hm.s.vmx.fUnrestrictedGuestCfg = true;
                     else
-                        Assert(!pVM->hm.s.vmx.fUnrestrictedGuest);
+                        Assert(!pVM->hm.s.vmx.fUnrestrictedGuestCfg);
                 }
             }
@@ -1566 +1566 @@
                        || (pVM->hm.s.vmx.MsrsForRing3.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_EPT),
                        VERR_HM_IPE_1);
-    AssertLogRelReturn(   !pVM->hm.s.vmx.fUnrestrictedGuest
+    AssertLogRelReturn(   !pVM->hm.s.vmx.fUnrestrictedGuestCfg
                        || (   (pVM->hm.s.vmx.MsrsForRing3.ProcCtls2.n.allowed1 & VMX_PROC_CTLS2_UNRESTRICTED_GUEST)
                            && pVM->hm.s.fNestedPagingCfg),
@@ -1583 +1583 @@
     }
 
-    if (!pVM->hm.s.vmx.fUnrestrictedGuest)
+    if (!pVM->hm.s.vmx.fUnrestrictedGuestCfg)
     {
         /* Allocate three pages for the TSS we need for real mode emulation. (2 pages for the IO bitmap) */
@@ -1706 +1706 @@
             LogRel(("HM:   EPT flush type                  = %#x\n", pVM->hm.s.vmx.enmTlbFlushEptForRing3));
 
-        if (pVM->hm.s.vmx.fUnrestrictedGuest)
+        if (pVM->hm.s.vmx.fUnrestrictedGuestCfg)
             LogRel(("HM: Enabled unrestricted guest execution\n"));
 
@@ -1717 +1717 @@
     }
     else
-        Assert(!pVM->hm.s.vmx.fUnrestrictedGuest);
+        Assert(!pVM->hm.s.vmx.fUnrestrictedGuestCfg);
 
     if (pVM->hm.s.vmx.fVpidForRing3)
@@ -2638 +2638 @@
      */
     if (    pVM->hm.s.vmx.fEnabled
-        && !pVM->hm.s.vmx.fUnrestrictedGuest
+        && !pVM->hm.s.vmx.fUnrestrictedGuestCfg
         &&  CPUMIsGuestInRealModeEx(pCtx)
         && !PDMVmmDevHeapIsEnabled(pVM))
@@ -2852 +2852 @@
     PVM pVM = pUVM->pVM;
     VM_ASSERT_VALID_EXT_RETURN(pVM, false);
-    return pVM->hm.s.vmx.fUnrestrictedGuest
+    return pVM->hm.s.vmx.fUnrestrictedGuestCfg
         || pVM->hm.s.svm.fSupported;
 }