Changeset 26662 in vbox

Timestamp:

Feb 19, 2010 3:11:13 PM (15 years ago)

Author:

vboxsync

Message:

VMM: conditionally expose MWAIT extensions

Location:

trunk/src/VBox

Files:

• Main/ConsoleImpl2.cpp (modified) (1 diff)
• VMM/CPUM.cpp (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -394 +394 @@
         rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM);                               RC_CHECK();
         rc = CFGMR3InsertInteger(pCPUM, "NT4LeafLimit", true);                      RC_CHECK();
+    }
+
+    if (osTypeId == "MacOS")
+    {
+        /*
+         * Expose extended MWAIT features to Mac OS guests.
+         */
+        LogRel(("Using MWAIT extensions\n"));
+        PCFGMNODE pCPUM;
+        rc = CFGMR3InsertNode(pRoot, "CPUM", &pCPUM);                               RC_CHECK();
+        rc = CFGMR3InsertInteger(pCPUM, "MWaitExtensions", true);                   RC_CHECK();
     }
 

trunk/src/VBox/VMM/CPUM.cpp

@@ -621 +621 @@
 
     pCPUM->aGuestCpuIdStd[5].ecx = pCPUM->aGuestCpuIdStd[5].edx = 0;
+    /** @cfgm{/CPUM/MWaitExtensions, boolean, false}
+     * Expose MWAIT extended features to the guest.
+     * For now we expose just MWAIT break on interrupt feature (bit 1)
+     */
+    bool fMWaitExtensions;
+    rc = CFGMR3QueryBoolDef(pCpumCfg, "MWaitExtensions", &fMWaitExtensions, false); AssertRCReturn(rc, rc);
+    if (fMWaitExtensions)
+        pCPUM->aGuestCpuIdStd[5].ecx = 3;
 
     /*