Changeset 2636 in vbox for trunk/src/VBox/Devices

Timestamp:

May 14, 2007 7:13:31 PM (18 years ago)

Author:

vboxsync

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

21161

Message:

enable local APIC if IOAPIC is enabled or CPU == Intel

CPU == AMD

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -1612 +1612 @@
     int             rc;
     int             i;
+    bool            fIOAPIC;
     bool            fGCEnabled;
     bool            fR0Enabled;
@@ -1619 +1620 @@
      * Validate configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0R0Enabled"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "0IOAPIC\0GCEnabled\0R0Enabled\0"))
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
+
+    rc = CFGMR3QueryBool (pCfgHandle, "IOAPIC", &fIOAPIC);
+    if (rc == VERR_CFGM_VALUE_NOT_FOUND)
+        fIOAPIC = true;
+    else if (VBOX_FAILURE (rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Failed to read \"IOAPIC\"."));
 
     rc = CFGMR3QueryBool(pCfgHandle, "GCEnabled", &fGCEnabled);
@@ -1701 +1709 @@
      * The the CPUID feature bit.
      */
-    pData->pApicHlpR3->pfnChangeFeature(pDevIns, true);
+    uint32_t u32Eax, u32Ebx, u32Ecx, u32Edx;
+    PDMDevHlpQueryCPUId(pDevIns, 0, &u32Eax, &u32Ebx, &u32Ecx, &u32Edx);
+    if (u32Eax >= 1)
+    {
+        if (   fIOAPIC                       /* If IOAPIC is enabled, enable Local APIC in any case */
+            || u32Ebx == 0x756e6547 && u32Ecx == 0x6c65746e && u32Edx == 0x49656e69 /* GenuineIntel */
+            || u32Ebx == 0x68747541 && u32Ecx == 0x69746e65 && u32Edx == 0x444d4163 /* AuthenticAMD */)
+            pData->pApicHlpR3->pfnChangeFeature(pDevIns, true);
+    }
 
     /*
@@ -1938 +1954 @@
      * Validate and read the configuration.
      */
-    if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0R0Enabled"))
+    if (!CFGMR3AreValuesValid(pCfgHandle, "GCEnabled\0R0Enabled\0"))
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;