Changeset 61100 in vbox for trunk

Timestamp:

May 20, 2016 1:46:42 PM (9 years ago)

Author:

vboxsync

Message:

Main/Console: limit the firmware APIC level to what the hardware can do, giving an appropriate message in the release log

File:

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

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

@@ -823 +823 @@
     APICMode_T apicMode;
     hrc = biosSettings->COMGETTER(APICMode)(&apicMode);                                     H();
-    uint32_t uAPIC;
+    uint32_t uFwAPIC;
     switch (apicMode)
     {
         case APICMode_Disabled:
-            uAPIC = 0;
+            uFwAPIC = 0;
             break;
         case APICMode_APIC:
-            uAPIC = 1;
+            uFwAPIC = 1;
             break;
         case APICMode_X2APIC:
-            uAPIC = 2;
+            uFwAPIC = 2;
             break;
         default:
             AssertMsgFailed(("Invalid APICMode=%d\n", apicMode));
-            uAPIC = 1;
+            uFwAPIC = 1;
             break;
     }
@@ -1031 +1031 @@
             fEnableX2APIC = false;
         }
+
+        /* Adjust firmware APIC handling to stay within the VCPU limits. */
+        if (uFwAPIC == 2 && !fEnableX2APIC)
+        {
+            if (fEnableAPIC)
+                uFwAPIC = 1;
+            else
+                uFwAPIC = 0;
+            LogRel(("Limiting the firmware APIC level from x2APIC to %s\n", fEnableAPIC ? "APIC" : "Disabled"));
+        }
+        else if (uFwAPIC == 1 && !fEnableAPIC)
+        {
+            uFwAPIC = 0;
+            LogRel(("Limiting the firmware APIC level from APIC to Disabled\n"));
+        }
 
         /*
@@ -1668 +1683 @@
             InsertConfigString(pBiosCfg,   "FloppyDevice",         "i82078");
             InsertConfigInteger(pBiosCfg,  "IOAPIC",               fIOAPIC);
-            InsertConfigInteger(pBiosCfg,  "APIC",                 uAPIC);
+            InsertConfigInteger(pBiosCfg,  "APIC",                 uFwAPIC);
             BOOL fPXEDebug;
             hrc = biosSettings->COMGETTER(PXEDebugEnabled)(&fPXEDebug);                     H();
@@ -1773 +1788 @@
             InsertConfigString(pCfg,   "DeviceProps",      deviceProps);
             InsertConfigInteger(pCfg,  "IOAPIC",           fIOAPIC);
-            InsertConfigInteger(pCfg,  "APIC",             uAPIC);
+            InsertConfigInteger(pCfg,  "APIC",             uFwAPIC);
             InsertConfigBytes(pCfg,    "UUID", &HardwareUuid,sizeof(HardwareUuid));
             InsertConfigInteger(pCfg,  "64BitEntry", f64BitEntry); /* boolean */