Changeset 22042 in vbox

Timestamp:

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

Author:

vboxsync

Message:

VMM: refactor CPUID limitation, passed OSType

Location:

trunk

Files:

• include/VBox/vm.h (modified) (1 diff)
• include/VBox/vm.mac (modified) (1 diff)
• src/VBox/Main/ConsoleImpl2.cpp (modified) (3 diffs)
• src/VBox/VMM/CPUM.cpp (modified) (2 diffs)
• src/VBox/VMM/VM.cpp (modified) (1 diff)

trunk/include/VBox/vm.h

@@ -692 +692 @@
     uint32_t                    offVMCPU;
 
-    /** Maximum CPUID leaf, exposed to this VM. */
-    uint32_t                    cCpuidLeafs;
-
     /** Reserved; alignment. */
-    uint32_t                    u32Reserved[5];
+    uint32_t                    u32Reserved[6];
 
     /** @name Public VMM Switcher APIs

trunk/include/VBox/vm.mac

@@ -59 +59 @@
     .cbSelf                 resd 1
     .offVMCPU               resd 1
-    .cCpuidLeafs            resd 1
-    .u32Reserved            resd 5
+    .u32Reserved            resd 6
 
     .pfnVMMGCGuestToHostAsmGuestCtx RTRCPTR_RES 1

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -212 +212 @@
     hrc = pMachine->COMGETTER(CPUCount)(&cCpus);                                    H();
 
-    ULONG cCpuidLeafs = 5;
     Bstr osTypeId;
     hrc = pMachine->COMGETTER(OSTypeId)(osTypeId.asOutParam());                     H();
-    if (osTypeId == "WindowsNT4")
-    {
-        /*
-         * We must limit CPUID count for Windows NT 4 manually,
-         * as otherwise it stops with 0x3e error
-         * (MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED).
-         */
-        LogRel(("Limiting CPUID leaf count for NT4 guests\n"));
-        cCpuidLeafs = 2;
-    }
 
     /*
@@ -244 +233 @@
     rc = CFGMR3InsertInteger(pRoot, "RamHoleSize",          cbRamHole);             RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "NumCPUs",              cCpus);                 RC_CHECK();
-    rc = CFGMR3InsertInteger(pRoot, "CpuidLeafs",           cCpuidLeafs);           RC_CHECK();
+    rc = CFGMR3InsertString (pRoot, "OSType",               Utf8Str(osTypeId));     RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "TimerMillies",         10);                    RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled",         1);     /* boolean */   RC_CHECK();
@@ -251 +240 @@
     rc = CFGMR3InsertInteger(pRoot, "PATMEnabled",          1);     /* boolean */   RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "CSAMEnabled",          1);     /* boolean */   RC_CHECK();
+
+    if (osTypeId == "WindowsNT4")
+    {
+        /*
+         * We must limit CPUID count for Windows NT 4,
+         * as otherwise it stops with 0x3e error
+         * (MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED).
+         */
+        LogRel(("Limiting CPUID leaf count for NT4 guests\n"));
+        rc = CFGMR3InsertInteger(pRoot, "NT4LeafLimit", true);                          RC_CHECK();
+    }
 
     /* hardware virtualization extensions */

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))