Changeset 22264 in vbox for trunk/src/VBox/Main

Timestamp:

Aug 14, 2009 3:23:54 PM (15 years ago)

Author:

vboxsync

Message:

Move the TPR patching decision logic to Main.

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -211 +211 @@
     hrc = pMachine->COMGETTER(OSTypeId)(osTypeId.asOutParam());                     H();
 
+    BOOL fIOAPIC;
+    hrc = biosSettings->COMGETTER(IOAPICEnabled)(&fIOAPIC);                          H();
+
     /*
      * Get root node first.
@@ -227 +230 @@
     rc = CFGMR3InsertInteger(pRoot, "RamHoleSize",          cbRamHole);             RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "NumCPUs",              cCpus);                 RC_CHECK();
-    rc = CFGMR3InsertString (pRoot, "OSType",               Utf8Str(osTypeId).c_str()); RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "TimerMillies",         10);                    RC_CHECK();
     rc = CFGMR3InsertInteger(pRoot, "RawR3Enabled",         1);     /* boolean */   RC_CHECK();
@@ -235 +237 @@
     rc = CFGMR3InsertInteger(pRoot, "CSAMEnabled",          1);     /* boolean */   RC_CHECK();
 
-    if (osTypeId == "WindowsNT4")
+    if (osTypeId == "WindowsNT")
     {
         /*
@@ -300 +302 @@
         }
 #endif
+
+        /* @todo Not exactly pretty to check strings; VBOXOSTYPE would be better, but that requires quite a bit of API change in Main. */
+        if (    !fIs64BitGuest
+            &&  fIOAPIC
+            &&  (   osTypeId == "WindowsNT"
+                 || osTypeId == "Windows"
+                 || osTypeId == "Windows 2000"
+                 || osTypeId == "WindowsXP"
+                 || osTypeId == "Windows 2003"))
+        {
+            /* Only allow TPR patching for NT, Win2k, XP and Windows Server 2003. (32 bits mode)
+             * We may want to consider adding more guest OSes (Solaris) later on.
+             */
+            rc = CFGMR3InsertInteger(pHWVirtExt, "TPRPatchingEnabled", 1);          RC_CHECK();
+        }
     }
 
@@ -316 +333 @@
     hrc = pMachine->COMGETTER(PAEEnabled)(&fEnablePAE);                             H();
     rc = CFGMR3InsertInteger(pRoot, "EnablePAE", fEnablePAE);                       RC_CHECK();
-
-    BOOL fIOAPIC;
-    hrc = biosSettings->COMGETTER(IOAPICEnabled)(&fIOAPIC);                          H();
 
     BOOL fPXEDebug;