Changeset 22070 in vbox

Timestamp:

Aug 7, 2009 1:34:10 PM (15 years ago)

Author:

vboxsync

Message:

VMM,ConsoleImpl2: Moved NT4LeafLimit down into /CPUM and documented it. Cleanup.

Location:

trunk/src/VBox

Files:

• Main/ConsoleImpl2.cpp (modified) (1 diff)
• VMM/CPUM.cpp (modified) (3 diffs)
• VMM/VMMAll/CPUMAllRegs.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -244 +244 @@
     {
         /*
-         * We must limit CPUID count for Windows NT 4,
-         * as otherwise it stops with 0x3e error
-         * (MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED).
+         * We must limit CPUID count for Windows NT 4, as otherwise it stops
+         * with error 0x3e (MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED).
          */
         LogRel(("Limiting CPUID leaf count for NT4 guests\n"));
-        rc = CFGMR3InsertInteger(pRoot, "NT4LeafLimit", true);                          RC_CHECK();
+        PCFGMNODE pCPUM;
+        rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM);                               RC_CHECK();
+        rc = CFGMR3InsertInteger(pCPUM, "NT4LeafLimit", true);                      RC_CHECK();
     }
 

trunk/src/VBox/VMM/CPUM.cpp

@@ -527 +527 @@
     }
 
+    /** @cfgm{/CPUM/NT4LeafLimit, boolean, false}
+     * Limit the number of standard CPUID leafs to 0..2 to prevent NT4 from
+     * bugchecking with MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED (0x3e).
+     * This option corrsponds somewhat to IA32_MISC_ENABLES.BOOT_NT4[bit 22].
+     * @todo r=bird: The intel docs states that leafs 3 is included, why don't we?
+     */
+    bool fNt4LeafLimit;
+    CFGMR3QueryBoolDef(CFGMR3GetChild(CFGMR3GetRoot(pVM), "CPUM"), "NT4LeafLimit", &fNt4LeafLimit, false);
+    if (fNt4LeafLimit)
+        pCPUM->aGuestCpuIdStd[0].eax = 2;
+
     /*
      * Limit it the number of entries and fill the remaining with the defaults.
@@ -534 +545 @@
      * info too in these leaves (like words about having a constant TSC).
      */
-    {
-        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;
@@ -556 +560 @@
 
     /*
-     * Workaround for missing cpuid(0) patches: If we miss to patch a cpuid(0).eax then
-     * Linux tries to determine the number of processors from (cpuid(4).eax >> 26) + 1.
-     * We currently don't support more than 1 processor.
+     * Workaround for missing cpuid(0) patches when leaf 4 returns GuestCpuIdDef:
+     * If we miss to patch a cpuid(0).eax then Linux tries to determine the number
+     * of processors from (cpuid(4).eax >> 26) + 1.
      */
     if (pVM->cCPUs == 1)

trunk/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp

@@ -1080 +1080 @@
    }
 
-    if ( iLeaf == 4 && fHasMoreCaches &&
-         pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_INTEL)
+    if (    iLeaf == 4
+        &&  fHasMoreCaches
+        &&  pVM->cpum.s.enmCPUVendor == CPUMCPUVENDOR_INTEL)
     {
         /* Report unified L0 cache, Linux'es num_cpu_cores() requires
@@ -2058 +2059 @@
     return enmMode;
 }
+