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

Timestamp:

Aug 6, 2009 4:58:57 PM (16 years ago)

Author:

vboxsync

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

50780

Message:

VMM: refactor CPUID limitation, passed OSType

Location:

trunk/src/VBox/VMM

Files:

• CPUM.cpp (modified) (2 diffs)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/CPUM.cpp

@@ -534 +534 @@
      * info too in these leaves (like words about having a constant TSC).
      */
-    if (pCPUM->aGuestCpuIdStd[0].eax > pVM->cCpuidLeafs)
-        pCPUM->aGuestCpuIdStd[0].eax = pVM->cCpuidLeafs;
+    {
+        bool fNt4LeafLimit;
+        PCFGMNODE pNode = CFGMR3GetRoot(pVM);
+        int rc = CFGMR3QueryBoolDef(pNode, "NT4LeafLimit", &fNt4LeafLimit, false);
+        if (RT_SUCCESS(rc) && fNt4LeafLimit)
+            pCPUM->aGuestCpuIdStd[0].eax = 2;
+    }
+    if (pCPUM->aGuestCpuIdStd[0].eax > 5)
+        pCPUM->aGuestCpuIdStd[0].eax = 5;
 
     for (i = pCPUM->aGuestCpuIdStd[0].eax + 1; i < RT_ELEMENTS(pCPUM->aGuestCpuIdStd); i++)
@@ -1121 +1128 @@
                               );
 
-        /* Make sure we don't forget to update the masks when enabling 
-         * features in the future. 
+        /* Make sure we don't forget to update the masks when enabling
+         * features in the future.
          */
-        AssertRelease(!(pVM->cpum.s.aGuestCpuIdStd[1].ecx & 
+        AssertRelease(!(pVM->cpum.s.aGuestCpuIdStd[1].ecx &
                               (   X86_CPUID_FEATURE_ECX_DTES64
                                |  X86_CPUID_FEATURE_ECX_VMX

trunk/src/VBox/VMM/VM.cpp

@@ -594 +594 @@
                     rc = VERR_INVALID_PARAMETER;
                 }
-            }
-            /*
-             * Set correct CPUID leafs limit, some guests types,
-             * notably Win NT 4.0 may wish to override this value.
-             */
-            if (RT_SUCCESS(rc))
-            {
-                 uint32_t cCpuidLeafs;
-                 rc = CFGMR3QueryU32Def(CFGMR3GetRoot(pVM), "CpuidLeafs", &cCpuidLeafs, 5);
-                 pVM->cCpuidLeafs = cCpuidLeafs;
             }
             if (RT_SUCCESS(rc))