Changeset 52247 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 31, 2014 1:49:15 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

95328

Message:

VMM/GIM: Keep Minimal GIM provider guest agnostic.

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CPUM.cpp (modified) (1 diff)
• GIM.cpp (modified) (4 diffs)
• GIMMinimal.cpp (modified) (1 diff)

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

@@ -1686 +1686 @@
      * Mini CPU selection support for making Mac OS X happy.
      */
-    /** @todo This should probably be removed, as GIM Minimal provider does this
-     *        work. */
     if (pCPUM->GuestFeatures.enmCpuVendor == CPUMCPUVENDOR_INTEL)
     {

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

@@ -115 +115 @@
     AssertLogRelRCReturn(rc, rc);
 
-    /** @cfgm{GIM/GuestOsId, uint32_t}
-     * The guest OS identifier. The default is 0, implying an unknown Guest OS. */
-    GIMOSID GuestOsId = GIMOSID_END;
-    uint32_t uGuestOsId;
-    rc = CFGMR3QueryU32Def(pCfgNode, "GuestOsId", &uGuestOsId, GIMOSID_UNKNOWN);
-    AssertLogRelRCReturn(rc, rc);
-    if (uGuestOsId < GIMOSID_END)
-    {
-        GuestOsId = (GIMOSID)uGuestOsId;
-        pVM->gim.s.enmGuestOsId = GuestOsId;
-    }
-    else
-    {
-        LogRel(("GIM: GuestOsId %u invalid.", uGuestOsId));
-        return VERR_GIM_INVALID_GUESTOS_ID;
-    }
-
     /*
      * Setup the GIM provider for this VM.
@@ -270 +253 @@
     rc = SSMR3PutU32(pSSM, pVM->gim.s.u32Version);
     AssertRCReturn(rc, rc);
-    rc = SSMR3PutU32(pSSM, pVM->gim.s.enmGuestOsId);
-    AssertRCReturn(rc, rc);
 
     /*
@@ -325 +306 @@
     AssertRCReturn(rc, rc);
     rc = SSMR3GetU32(pSSM, &pVM->gim.s.u32Version);
-    AssertRCReturn(rc, rc);
-    rc = SSMR3GetU32(pSSM, (uint32_t *)&pVM->gim.s.enmGuestOsId);
     AssertRCReturn(rc, rc);
 
@@ -608 +587 @@
 #endif
 
-
-/**
- * Checks if the GIM Guest OS identifier for this VM implies an OS X family of
- * guests.
- *
- * @returns true if it's an OS X guest, false otherwise.
- * @param   pVM         Pointer to the VM.
- */
-VMMR3_INT_DECL(bool) GIMR3IsOSXGuest(PVM pVM)
-{
-    switch (pVM->gim.s.enmGuestOsId)
-    {
-        case GIMOSID_OSX:
-        case GIMOSID_OSX_64:
-        case GIMOSID_OSX_106:
-        case GIMOSID_OSX_106_64:
-        case GIMOSID_OSX_107:
-        case GIMOSID_OSX_107_64:
-        case GIMOSID_OSX_108:
-        case GIMOSID_OSX_108_64:
-        case GIMOSID_OSX_109:
-        case GIMOSID_OSX_109_64:
-        {
-            return true;
-        }
-
-        default:    /* shut up gcc */
-            break;
-    }
-    return false;
-}
-

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

@@ -43 +43 @@
     CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_HVP);
 
-    if (GIMR3IsOSXGuest(pVM))
-    {
-        /*
-         * Enable MWAIT Extensions for OS X Guests.
-         */
-        CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_MWAIT_EXTS);
-
-        /*
-         * 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 OS X
-         * expects more from systems with newer CPUs (MSRs, power features etc.)
-         */
-        if (CPUMGetGuestCpuVendor(pVM) == CPUMCPUVENDOR_INTEL)
-        {
-            uint32_t uMaxIntelFamilyModelStep = UINT32_MAX;
-            switch (pVM->gim.s.enmGuestOsId)
-            {
-                case GIMOSID_OSX:
-                case GIMOSID_OSX_64:
-                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482. */
-                    break;
-
-                case GIMOSID_OSX_106:
-                case GIMOSID_OSX_106_64:
-                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
-                    break;
-
-                case GIMOSID_OSX_107:
-                case GIMOSID_OSX_107_64:
-                    /** @todo Figure out what is required here. */
-                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
-                    break;
-
-                case GIMOSID_OSX_108:
-                case GIMOSID_OSX_108_64:
-                    /** @todo Figure out what is required here. */
-                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
-                    break;
-
-                case GIMOSID_OSX_109:
-                case GIMOSID_OSX_109_64:
-                    /** @todo Figure out what is required here. */
-                    uMaxIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(1, 23, 6, 7); /* Penryn / X5482 */
-                    break;
-
-                default:    /* shut up gcc */
-                    break;
-            }
-
-            if (uMaxIntelFamilyModelStep != UINT32_MAX)
-            {
-                CPUMCPUIDLEAF Leaf;
-                int rc = CPUMR3CpuIdGetLeaf(pVM, &Leaf, 1, 0 /* uSubLeaf */);
-                if (RT_SUCCESS(rc))
-                {
-                    uint32_t uCurIntelFamilyModelStep = RT_MAKE_U32_FROM_U8(ASMGetCpuStepping(Leaf.uEax),
-                                                                            ASMGetCpuModelIntel(Leaf.uEax),
-                                                                            ASMGetCpuFamily(Leaf.uEax),
-                                                                            0);
-                    if (uMaxIntelFamilyModelStep < uCurIntelFamilyModelStep)
-                    {
-                        uint32_t uNew = Leaf.uEax & 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 */
-                        /* 8 high family bits, Intel's suggested calculation. */
-                        if (RT_BYTE3(uMaxIntelFamilyModelStep) > 0xf)
-                        {
-                            uNew |= (  (RT_BYTE3(uMaxIntelFamilyModelStep)
-                                     - (RT_BYTE3(uMaxIntelFamilyModelStep) & 0xf)) & 0xff ) << 20;
-                        }
-
-                        LogRel(("GIM: Minimal: CPUID(0).EAX %#x -> %#x (uMaxIntelFamilyModelStep=%#x, uCurIntelFamilyModelStep=%#x\n",
-                                Leaf.uEax, uNew, uMaxIntelFamilyModelStep, uCurIntelFamilyModelStep));
-                        Leaf.uEax = uNew;
-                    }
-
-                    rc = CPUMR3CpuIdInsert(pVM, &Leaf);
-                    if (RT_FAILURE(rc))
-                    {
-                        LogRel(("GIM: Minimal: Failed to insert CPUID leaf for OS X guest. rc=%Rrc\n", rc));
-                        return rc;
-                    }
-                }
-                else
-                {
-                    LogRel(("GIM: Minimal: Failed to retreive std. CPUID leaf. rc=%Rrc\n", rc));
-                    return rc;
-                }
-            }
-        }
-    }
-
     return VINF_SUCCESS;
 }