Changeset 30459 in vbox for trunk/src

Timestamp:

Jun 28, 2010 11:34:17 AM (15 years ago)

Author:

vboxsync

Message:

ConsoleImpl2.cpp: Don't try create the CPUM node more than once, it will fail. Fixes nt4 + cpuid overrides.

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -435 +435 @@
     rc = CFGMR3InsertInteger(pRoot, "MemBalloonSize",       ulBalloonSize);             RC_CHECK();
 
+    /*
+     * CPUM values.
+     */
+    PCFGMNODE pCPUM;
+    rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM);                                       RC_CHECK();
+
     /* cpuid leaf overrides. */
     static uint32_t const s_auCpuIdRanges[] =
@@ -449 +455 @@
             {
                 PCFGMNODE pLeaf;
-                rc = CFGMR3InsertNodeF(pRoot, &pLeaf, "CPUM/HostCPUID/%RX32", uLeaf);   RC_CHECK();
+                rc = CFGMR3InsertNodeF(pCPUM, &pLeaf, "HostCPUID/%RX32", uLeaf);        RC_CHECK();
 
                 rc = CFGMR3InsertInteger(pLeaf, "eax", ulEax);                          RC_CHECK();
@@ -459 +465 @@
         }
 
+    /* We must limit CPUID count for Windows NT 4, as otherwise it stops
+       with error 0x3e (MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED). */
     if (osTypeId == "WindowsNT4")
     {
-        /*
-         * 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"));
-        PCFGMNODE pCPUM;
-        rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM);                                   RC_CHECK();
         rc = CFGMR3InsertInteger(pCPUM, "NT4LeafLimit", true);                          RC_CHECK();
     }
 
+    /* Expose extended MWAIT features to Mac OS X guests. */
     if (fOsXGuest)
     {
-        /*
-         * Expose extended MWAIT features to Mac OS X guests.
-         */
         LogRel(("Using MWAIT extensions\n"));
-        PCFGMNODE pCPUM;
-        rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM);                                   RC_CHECK();
         rc = CFGMR3InsertInteger(pCPUM, "MWaitExtensions", true);                       RC_CHECK();
     }
 
-    /* hardware virtualization extensions */
+    /*
+     * Hardware virtualization extensions.
+     */
     BOOL fHWVirtExEnabled;
     BOOL fHwVirtExtForced;