Index: /trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp
===================================================================
--- /trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp	(revision 92515)
+++ /trunk/src/VBox/VMM/VMMR3/CPUMR3CpuId.cpp	(revision 92516)
@@ -4228,5 +4228,5 @@
             if (VM_IS_NEM_ENABLED(pVM))
             {
-                LogRel(("CPUM: WARNING! Can't turn on nested VT-x/AMD-V when NEM is used!\n"));
+                LogRel(("CPUM: WARNING! Can't turn on nested VT-x/AMD-V when NEM is used! (later)\n"));
                 pConfig->fNestedHWVirt = false;
             }
@@ -4340,9 +4340,9 @@
     AssertLogRelRCReturn(rc, rc);
 
-    bool const fMayHaveXSave = fNestedPagingAndFullGuestExec
-                            && pVM->cpum.s.HostFeatures.fXSaveRstor
+    bool const fMayHaveXSave = pVM->cpum.s.HostFeatures.fXSaveRstor
                             && pVM->cpum.s.HostFeatures.fOpSysXSaveRstor
-                            && (   !VM_IS_NEM_ENABLED(pVM)
-                                || (NEMHCGetFeatures(pVM) & NEM_FEAT_F_XSAVE_XRSTOR));
+                            && (  !VM_IS_NEM_ENABLED(pVM)
+                                ? fNestedPagingAndFullGuestExec
+                                : NEMHCGetFeatures(pVM) & NEM_FEAT_F_XSAVE_XRSTOR);
     uint64_t const fXStateHostMask = pVM->cpum.s.fXStateHostMask;
 
@@ -4545,8 +4545,5 @@
     RT_ZERO(Config);
 
-    bool const fNestedPagingAndFullGuestExec =   VM_IS_NEM_ENABLED(pVM)
-                                               ?     ((NEMHCGetFeatures(pVM) & (NEM_FEAT_F_NESTED_PAGING | NEM_FEAT_F_FULL_GST_EXEC))
-                                                  == (NEM_FEAT_F_NESTED_PAGING | NEM_FEAT_F_FULL_GST_EXEC))
-                                               : HMAreNestedPagingAndFullGuestExecEnabled(pVM);
+    bool const fNestedPagingAndFullGuestExec = VM_IS_NEM_ENABLED(pVM) || HMAreNestedPagingAndFullGuestExecEnabled(pVM);
     int rc = cpumR3CpuIdReadConfig(pVM, &Config, pCpumCfg, fNestedPagingAndFullGuestExec);
     AssertRCReturn(rc, rc);