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

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

Location:

trunk/src/VBox/VMM/VMMAll

Files:

• HMAll.cpp (modified) (1 diff)
• HMVMXAll.cpp (modified) (1 diff)

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

@@ -648 +648 @@
     return HMIsEnabled(pVM)
         && CTX_EXPR(pVM->hm.s.fNestedPagingCfg, pVM->hmr0.s.fNestedPaging, RT_NOTHING)
-        && (   pVM->hm.s.vmx.fUnrestrictedGuest
+        && (   CTX_EXPR(pVM->hm.s.vmx.fUnrestrictedGuestCfg, pVM->hmr0.s.vmx.fUnrestrictedGuest, RT_NOTHING)
             || pVM->hm.s.svm.fSupported);
 }

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

@@ -605 +605 @@
 {
     Assert(HMIsEnabled(pVM));
-    Assert(   ( pVM->hm.s.vmx.fUnrestrictedGuest && !pVM->hm.s.vmx.pRealModeTSS)
-           || (!pVM->hm.s.vmx.fUnrestrictedGuest && pVM->hm.s.vmx.pRealModeTSS));
+    bool const fUnrestrictedGuest = CTX_EXPR(pVM->hm.s.vmx.fUnrestrictedGuestCfg, pVM->hmr0.s.vmx.fUnrestrictedGuest, RT_NOTHING);
+    Assert(   ( fUnrestrictedGuest && !pVM->hm.s.vmx.pRealModeTSS)
+           || (!fUnrestrictedGuest && pVM->hm.s.vmx.pRealModeTSS));
 
     pVCpu->hm.s.fActive = false;
 
-    bool const fSupportsRealMode = pVM->hm.s.vmx.fUnrestrictedGuest || PDMVmmDevHeapIsEnabled(pVM);
-    if (!pVM->hm.s.vmx.fUnrestrictedGuest)
+    bool const fSupportsRealMode = fUnrestrictedGuest || PDMVmmDevHeapIsEnabled(pVM);
+    if (!fUnrestrictedGuest)
     {
         /*