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

Timestamp:

Jul 2, 2014 10:28:42 AM (11 years ago)

Author:

vboxsync

Message:

Main/src-client: Fix GIM provider for default/legacy OS X VMs.

File:

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

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1002 +1002 @@
         }
 
-#if 0
-        /* Expose extended MWAIT features to Mac OS X guests. */
-        if (fOsXGuest)
-        {
-            LogRel(("Using MWAIT extensions\n"));
-            InsertConfigInteger(pCPUM, "MWaitExtensions", true);
-        }
-
-        if (fOsXGuest)
-        {
-            InsertConfigInteger(pCPUM, "EnableHVP", 1);
-
-            /* Fake the CPU family/model so the guest works.  This is partly
-               because older mac releases really doesn't work on newer cpus,
-               and partly because mac os x expects more from systems with newer
-               cpus (MSRs, power features, whatever). */
-            uint32_t uMaxIntelFamilyModelStep = UINT32_MAX;
-            if (   osTypeId == "MacOS"
-                || osTypeId == "MacOS_64")
-                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482. */
-            else if (   osTypeId == "MacOS106"
-                     || osTypeId == "MacOS106_64")
-                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
-            else if (   osTypeId == "MacOS107"
-                     || osTypeId == "MacOS107_64")
-                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */ /** @todo figure out
-                                                                                what is required here. */
-            else if (   osTypeId == "MacOS108"
-                     || osTypeId == "MacOS108_64")
-                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */ /** @todo figure out
-                                                                                what is required here. */
-            else if (   osTypeId == "MacOS109"
-                     || osTypeId == "MacOS109_64")
-                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */ /** @todo figure
-                                                                                out what is required here. */
-            if (uMaxIntelFamilyModelStep != UINT32_MAX)
-                InsertConfigInteger(pCPUM, "MaxIntelFamilyModelStep", uMaxIntelFamilyModelStep);
-        }
-#endif
-
         /* Synthetic CPU */
         BOOL fSyntheticCpu = false;
@@ -1203 +1163 @@
                 break;
 
-            case ParavirtProvider_Default:  /** @todo Choose a provider based on guest OS type. There is no "Default" provider. */
-                pcszParavirtProvider = "None";
-                fGimDeviceNeeded = false;
+            case ParavirtProvider_Default:
+            {
+                if (fOsXGuest)
+                {
+                    pcszParavirtProvider = "Minimal";
+                    fGimDeviceNeeded = false;
+                }
+                else
+                {
+                    /** @todo Choose a provider based on guest OS type. There is no "Default" provider. */
+                    pcszParavirtProvider = "None";
+                    fGimDeviceNeeded = false;
+                }
                 break;
+            }
 
             case ParavirtProvider_Legacy:
@@ -1213 +1184 @@
                     pcszParavirtProvider = "Minimal";
                 else
-                {
                     pcszParavirtProvider = "None";
-                    fGimDeviceNeeded = false;
-                }
+                fGimDeviceNeeded = false;
                 break;
             }