Changeset 56873 in vbox for trunk/src/VBox/VMM

Timestamp:

Jul 8, 2015 3:31:28 PM (10 years ago)

Author:

vboxsync

Message:

CPUMR3CpuId.cpp: Don't expose AVX and AVX-2 if the YMM XSAVE state component can't be exposed to the guest.

File:

• trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp (modified) (3 diffs)

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

@@ -3718 +3718 @@
                             && pVM->cpum.s.HostFeatures.fXSaveRstor
                             && pVM->cpum.s.HostFeatures.fOpSysXSaveRstor;
+    uint64_t const fXStateHostMask = pVM->cpum.s.fXStateHostMask;
 
     /** @cfgm{/CPUM/IsaExts/XSAVE, boolean, depends}
@@ -3735 +3736 @@
      */
     rc = cpumR3CpuIdReadIsaExtCfgEx(pVM, pIsaExts, "AVX", &pConfig->enmAvx, fNestedPagingAndFullGuestExec,
-                                    fMayHaveXSave && pConfig->enmXSave /*fAllowed*/);
+                                    fMayHaveXSave && pConfig->enmXSave && (fXStateHostMask & XSAVE_C_YMM)  /*fAllowed*/);
     AssertLogRelRCReturn(rc, rc);
 
@@ -3744 +3745 @@
      */
     rc = cpumR3CpuIdReadIsaExtCfgEx(pVM, pIsaExts, "AVX2", &pConfig->enmAvx2, fNestedPagingAndFullGuestExec,
-                                    fMayHaveXSave && pConfig->enmXSave /*fAllowed*/);
+                                    fMayHaveXSave && pConfig->enmXSave && (fXStateHostMask & XSAVE_C_YMM) /*fAllowed*/);
     AssertLogRelRCReturn(rc, rc);