VirtualBox

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


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/VMM/VMMAll/HMAll.cpp

    r87543 r87547  
    648648    return HMIsEnabled(pVM)
    649649        && CTX_EXPR(pVM->hm.s.fNestedPagingCfg, pVM->hmr0.s.fNestedPaging, RT_NOTHING)
    650         && (   pVM->hm.s.vmx.fUnrestrictedGuest
     650        && (   CTX_EXPR(pVM->hm.s.vmx.fUnrestrictedGuestCfg, pVM->hmr0.s.vmx.fUnrestrictedGuest, RT_NOTHING)
    651651            || pVM->hm.s.svm.fSupported);
    652652}
  • trunk/src/VBox/VMM/VMMAll/HMVMXAll.cpp

    r87543 r87547  
    605605{
    606606    Assert(HMIsEnabled(pVM));
    607     Assert(   ( pVM->hm.s.vmx.fUnrestrictedGuest && !pVM->hm.s.vmx.pRealModeTSS)
    608            || (!pVM->hm.s.vmx.fUnrestrictedGuest && pVM->hm.s.vmx.pRealModeTSS));
     607    bool const fUnrestrictedGuest = CTX_EXPR(pVM->hm.s.vmx.fUnrestrictedGuestCfg, pVM->hmr0.s.vmx.fUnrestrictedGuest, RT_NOTHING);
     608    Assert(   ( fUnrestrictedGuest && !pVM->hm.s.vmx.pRealModeTSS)
     609           || (!fUnrestrictedGuest && pVM->hm.s.vmx.pRealModeTSS));
    609610
    610611    pVCpu->hm.s.fActive = false;
    611612
    612     bool const fSupportsRealMode = pVM->hm.s.vmx.fUnrestrictedGuest || PDMVmmDevHeapIsEnabled(pVM);
    613     if (!pVM->hm.s.vmx.fUnrestrictedGuest)
     613    bool const fSupportsRealMode = fUnrestrictedGuest || PDMVmmDevHeapIsEnabled(pVM);
     614    if (!fUnrestrictedGuest)
    614615    {
    615616        /*
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette