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

Timestamp:

Jan 23, 2018 5:13:05 PM (7 years ago)

Author:

vboxsync

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

120457

Message:

VMM/CPUM: Changed the nested SVM CFGM key to the common NestedHWVirt one.

File:

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

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

@@ -2326 +2326 @@
     bool            fInvariantTsc;
     bool            fForceVme;
+    bool            fNestedHWVirt;
 
     CPUMISAEXTCFG   enmCmpXchg16b;
@@ -2351 +2352 @@
     CPUMISAEXTCFG   enm3dNowPrf;
     CPUMISAEXTCFG   enmAmdExtMmx;
-    CPUMISAEXTCFG   enmSvm;
 
     uint32_t        uMaxStdLeaf;
@@ -2880 +2880 @@
         pExtFeatureLeaf->uEcx &= X86_CPUID_EXT_FEATURE_ECX_LAHF_SAHF
                                //| X86_CPUID_AMD_FEATURE_ECX_CMPL   - set below if applicable.
-                               | (pConfig->enmSvm       ? X86_CPUID_AMD_FEATURE_ECX_SVM : 0)
+                               | (pConfig->fNestedHWVirt ? X86_CPUID_AMD_FEATURE_ECX_SVM : 0)
                                //| X86_CPUID_AMD_FEATURE_ECX_EXT_APIC
                                /* Note: This could prevent teleporting from AMD to Intel CPUs! */
@@ -2920 +2920 @@
         if (pCpum->u8PortableCpuIdLevel > 0)
         {
+            CPUMISAEXTCFG enmSvm = pConfig->fNestedHWVirt ? CPUMISAEXTCFG_ENABLED_SUPPORTED : CPUMISAEXTCFG_DISABLED;
             PORTABLE_DISABLE_FEATURE_BIT(    1, pExtFeatureLeaf->uEcx, CR8L,       X86_CPUID_AMD_FEATURE_ECX_CR8L);
-            PORTABLE_DISABLE_FEATURE_BIT_CFG(1, pExtFeatureLeaf->uEcx, SVM,        X86_CPUID_AMD_FEATURE_ECX_SVM,       pConfig->enmSvm);
+            PORTABLE_DISABLE_FEATURE_BIT_CFG(1, pExtFeatureLeaf->uEcx, SVM,        X86_CPUID_AMD_FEATURE_ECX_SVM,       enmSvm);
             PORTABLE_DISABLE_FEATURE_BIT_CFG(1, pExtFeatureLeaf->uEcx, ABM,        X86_CPUID_AMD_FEATURE_ECX_ABM,       pConfig->enmAbm);
             PORTABLE_DISABLE_FEATURE_BIT_CFG(1, pExtFeatureLeaf->uEcx, SSE4A,      X86_CPUID_AMD_FEATURE_ECX_SSE4A,     pConfig->enmSse4A);
@@ -2964 +2965 @@
         if (pConfig->enmSse4A     == CPUMISAEXTCFG_ENABLED_ALWAYS)
             pExtFeatureLeaf->uEcx |= X86_CPUID_AMD_FEATURE_ECX_SSE4A;
-        if (pConfig->enmSvm       == CPUMISAEXTCFG_ENABLED_ALWAYS)
-            pExtFeatureLeaf->uEcx |= X86_CPUID_AMD_FEATURE_ECX_SVM;
         if (pConfig->enmMisAlnSse == CPUMISAEXTCFG_ENABLED_ALWAYS)
             pExtFeatureLeaf->uEcx |= X86_CPUID_AMD_FEATURE_ECX_MISALNSSE;
@@ -2972 +2971 @@
         if (pConfig->enmAmdExtMmx  == CPUMISAEXTCFG_ENABLED_ALWAYS)
             pExtFeatureLeaf->uEdx |= X86_CPUID_AMD_FEATURE_EDX_AXMMX;
-        if (pConfig->enmSvm        == CPUMISAEXTCFG_ENABLED_ALWAYS)
-            pExtFeatureLeaf->uEcx |= X86_CPUID_AMD_FEATURE_ECX_SVM;
     }
     pExtFeatureLeaf = NULL; /* Must refetch! */
@@ -3929 +3926 @@
     AssertLogRelRCReturn(rc, rc);
 
+#ifdef VBOX_WITH_NESTED_HWVIRT
+    /** @cfgm{/CPUM/NestedHWVirt, bool, false}
+     * Whether to expose the hardware virtualization (VMX/SVM) feature to the guest.
+     * The default is false, and when enabled requires nested paging and AMD-V or
+     * unrestricted guest mode.
+     */
+    rc = CFGMR3QueryBoolDef(pCpumCfg, "NestedHWVirt", &pConfig->fNestedHWVirt, false);
+    AssertLogRelRCReturn(rc, rc);
+    pConfig->fNestedHWVirt &= fNestedPagingAndFullGuestExec;
+#endif
 
     /*
@@ -3960 +3967 @@
                                   "|3DNOWPRF"
                                   "|AXMMX"
-                                  "|SVM"
                                   , "" /*pszValidNodes*/, "CPUM" /*pszWho*/, 0 /*uInstance*/);
         if (RT_FAILURE(rc))
@@ -4152 +4158 @@
     rc = cpumR3CpuIdReadIsaExtCfg(pVM, pIsaExts, "AXMMX", &pConfig->enmAmdExtMmx, fNestedPagingAndFullGuestExec);
     AssertLogRelRCReturn(rc, rc);
-
-#ifdef VBOX_WITH_NESTED_HWVIRT
-    /** @cfgm{/CPUM/IsaExts/SVM, isaextcfg, depends}
-     * Whether to expose the AMD's hardware virtualization (SVM) instructions to the
-     * guest. For the time being, the default is to only do this for VMs with nested
-     * paging and AMD-V.
-     */
-    rc = cpumR3CpuIdReadIsaExtCfg(pVM, pIsaExts, "SVM", &pConfig->enmSvm, fNestedPagingAndFullGuestExec);
-    AssertLogRelRCReturn(rc, rc);
-#endif
 
     return VINF_SUCCESS;