Changeset 48701 in vbox

Timestamp:

Sep 26, 2013 10:20:10 AM (11 years ago)

Author:

vboxsync

Message:

Introduced /CPUM/MaxIntelFamilyModelStep config variable to hack Mac OS X guests into working.

Location:

trunk/src/VBox

Files:

• Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)
• VMM/VMMR3/CPUM.cpp (modified) (4 diffs)

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

@@ -881 +881 @@
 
         if (fOsXGuest)
-            InsertConfigInteger(pCPUM, "EnableHVP", 1);
+        {
+            if (   osTypeId == "MacOS"
+                || osTypeId == "MacOS_x64"
+                || osTypeId >= "MacOS107_x64")
+                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_x64")
+                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn. */
+            else if (   osTypeId == "MacOS106"
+                     || osTypeId == "MacOS106_x64")
+                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn */
+            else if (   osTypeId == "MacOS107"
+                     || osTypeId == "MacOS107_x64")
+                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn */ /** @todo figure out what is required here. */
+            else if (   osTypeId == "MacOS108"
+                     || osTypeId == "MacOS108_x64")
+                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn */ /** @todo figure out what is required here. */
+            else if (   osTypeId == "MacOS109"
+                     || osTypeId == "MacOS109_x64")
+                uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 0); /* Penryn */ /** @todo figure out what is required here. */
+            if (uMaxIntelFamilyModelStep != UINT32_MAX)
+                InsertConfigInteger(pCPUM, "MaxIntelFamilyModelStep", uMaxIntelFamilyModelStep);
+        }
+
 
         /* Synthetic CPU */
@@ -2673 +2702 @@
         if (fACPI)
         {
-            BOOL fCpuHotPlug = false;
-            BOOL fShowCpu = fOsXGuest;
             /* Always show the CPU leafs when we have multiple VCPUs or when the IO-APIC is enabled.
              * The Windows SMP kernel needs a CPU leaf or else its idle loop will burn cpu cycles; the
              * intelppm driver refuses to register an idle state handler.
-             */
-            if ((cCpus > 1) || fIOAPIC)
+             * Always show CPU leafs for OS X guests. */
+            BOOL fShowCpu = fOsXGuest;
+            if (cCpus > 1 || fIOAPIC)
                 fShowCpu = true;
 
+            BOOL fCpuHotPlug;
             hrc = pMachine->COMGETTER(CPUHotPlugEnabled)(&fCpuHotPlug);                     H();
 

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -857 +857 @@
     rc = CFGMR3QueryBoolDef(pCpumCfg, "CMPXCHG16B", &fCmpXchg16b, false); AssertRCReturn(rc, rc);
 
+    /** @cfgm{/CPUM/MONITOR, boolean, true}
+     * Expose MONITOR/MWAIT instructions to the guest.
+     */
     bool fMonitor;
     rc = CFGMR3QueryBoolDef(pCpumCfg, "MONITOR", &fMonitor, true); AssertRCReturn(rc, rc);
@@ -1193 +1196 @@
     {
         pCPUM->aGuestCpuIdStd[5].ecx = X86_CPUID_MWAIT_ECX_EXT | X86_CPUID_MWAIT_ECX_BREAKIRQIF0;
-        /* @todo: for now we just expose host's MWAIT C-states, although conceptually
+        /** @todo: for now we just expose host's MWAIT C-states, although conceptually
            it shall be part of our power management virtualization model */
 #if 0
@@ -1294 +1297 @@
     bool fNt4LeafLimit;
     rc = CFGMR3QueryBoolDef(pCpumCfg, "NT4LeafLimit", &fNt4LeafLimit, false); AssertRCReturn(rc, rc);
-    if (fNt4LeafLimit)
-        pCPUM->aGuestCpuIdStd[0].eax = 3; /** @todo r=bird: shouldn't we check if pCPUM->aGuestCpuIdStd[0].eax > 3 before setting it 3 here? */
+    if (fNt4LeafLimit && pCPUM->aGuestCpuIdStd[0].eax > 3)
+        pCPUM->aGuestCpuIdStd[0].eax = 3;
 
     /*
@@ -1353 +1356 @@
     pCPUM->aGuestCpuIdHyper[1].ebx = pCPUM->aGuestCpuIdHyper[1].ecx
                                    = pCPUM->aGuestCpuIdHyper[1].edx = 0;    /* Reserved */
+
+    /*
+     * Mini CPU selection support for making Mac OS X happy.
+     */
+    if (pCPUM->enmGuestCpuVendor == CPUMCPUVENDOR_INTEL)
+    {
+        /** @cfgm{/CPUM/MaxIntelFamilyModelStep, uint32_t, UINT32_MAX}
+         * Restrict the reported CPU family+model+stepping of intel CPUs.  This is
+         * probably going to be a temporary hack, so don't depend on this.
+         * The 1st byte of the value is the stepping, the 2nd byte value is the model
+         * number and the 3rd byte value is the family, and the 4th value must be zero.
+         */
+        uint32_t uMaxIntelFamilyModelStep;
+        rc = CFGMR3QueryU32Def(pCpumCfg, "MaxIntelFamilyModelStep", &uMaxIntelFamilyModelStep, UINT32_MAX);
+        AssertRCReturn(rc, rc);
+        uint32_t uCurIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(ASMGetCpuStepping(pCPUM->aGuestCpuIdStd[1].eax),
+                                                                ASMGetCpuModelIntel(pCPUM->aGuestCpuIdStd[1].eax),
+                                                                ASMGetCpuFamily(pCPUM->aGuestCpuIdStd[1].eax),
+                                                                0);
+        if (uMaxIntelFamilyModelStep < uCurIntelFamilyModelStep)
+        {
+            uint32_t uNew = pCPUM->aGuestCpuIdStd[1].eax & UINT32_C(0xf0003000);
+            uNew |= RT_BYTE1(uMaxIntelFamilyModelStep) & 0xf; /* stepping */
+            uNew |= (RT_BYTE2(uMaxIntelFamilyModelStep) & 0xf) << 4; /* 4 low model bits */
+            uNew |= (RT_BYTE2(uMaxIntelFamilyModelStep) >> 4) << 16; /* 4 high model bits */
+            uNew |= (RT_BYTE3(uMaxIntelFamilyModelStep) & 0xf) << 8; /* 4 low family bits */
+            if (RT_BYTE3(uMaxIntelFamilyModelStep) > 0xf) /* 8 high family bits, using intel's suggested calculation. */
+                uNew |= ( (RT_BYTE3(uMaxIntelFamilyModelStep) - (RT_BYTE3(uMaxIntelFamilyModelStep) & 0xf)) & 0xff ) << 20;
+            LogRel(("CPU: CPUID(0).EAX %#x -> %#x (uMaxIntelFamilyModelStep=%#x, uCurIntelFamilyModelStep=%#x\n",
+                    pCPUM->aGuestCpuIdStd[1].eax, uNew, uMaxIntelFamilyModelStep, uCurIntelFamilyModelStep));
+            pCPUM->aGuestCpuIdStd[1].eax = uNew;
+        }
+    }
 
     /*