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

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/VMM/HWACCM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -327 +327 @@
      * Check CFGM options.
      */
-    PCFGMNODE pRoot      = CFGMR3GetRoot(pVM);
-
-    char *pszOSType = NULL;
-    rc = CFGMR3QueryStringAlloc(pRoot, "OSType", &pszOSType);
-    AssertRC(rc);
-    
-    pVM->hwaccm.s.fTRPPatchingAllowed = false;
-    if (pszOSType)
-    {
-        /* @todo Not exactly pretty to check strings; VBOXOSTYPE would be better, but that requires quite a bit of API change in Main. */
-        if (    !RTStrCmp(pszOSType, "WindowsNT4")
-            ||  !RTStrCmp(pszOSType, "WindowsNT")
-            ||  !RTStrCmp(pszOSType, "Windows 2000")
-            ||  !RTStrCmp(pszOSType, "WindowsXP")
-            ||  !RTStrCmp(pszOSType, "Windows 2003"))
-        {
-            /* Only allow TPR patching for NT, Win2k, XP and Windows Server 2003. (32 bits mode)
-             * (IO-APIC presence is checked later on in HWACCMR3InitFinalizeR0)
-             *
-             * We may want to consider adding more guest OSes (Solaris) later on.
-             */
-            pVM->hwaccm.s.fTRPPatchingAllowed = true;
-        }
-        MMR3HeapFree(pszOSType);
-    }
-
+    PCFGMNODE pRoot      = CFGMR3GetRoot(pVM); 
     PCFGMNODE pHWVirtExt = CFGMR3GetChild(pRoot, "HWVirtExt/");
     /* Nested paging: disabled by default. */
@@ -364 +339 @@
     /* HWACCM support must be explicitely enabled in the configuration file. */
     rc = CFGMR3QueryBoolDef(pHWVirtExt, "Enabled", &pVM->hwaccm.s.fAllowed, false);
+    AssertRC(rc);
+
+    /* TPR patching for 32 bits (Windows) guests with IO-APIC: disabled by default. */
+    rc = CFGMR3QueryBoolDef(pRoot, "TPRPatchingEnabled", &pVM->hwaccm.s.fTRPPatchingAllowed, false);
     AssertRC(rc);
 
@@ -671 +650 @@
 
     pVM->hwaccm.s.fHasIoApic = PDMHasIoApic(pVM);
-    /* No TPR patching is required when the IO-APIC is not enabled for this VM. */
+    /* No TPR patching is required when the IO-APIC is not enabled for this VM. (Main should have taken care of this already) */
     if (!pVM->hwaccm.s.fHasIoApic)
+    {
+        Assert(pVM->hwaccm.s.fTRPPatchingAllowed); /* paranoia */
         pVM->hwaccm.s.fTRPPatchingAllowed = false;
+    }
 
     if (pVM->hwaccm.s.vmx.fSupported)