Changeset 61042 in vbox for trunk/src/VBox/Main/xml

Timestamp:

May 19, 2016 11:57:10 AM (9 years ago)

Author:

vboxsync

Message:

Main/Machine+BIOSSettings: introduce APIC/X2APIC CPU feature settings and a BIOS setting what should be used.
Frontends/VBoxManage: corresponding changes to allow making the settings changes
Devices/BIOS+EFI: placeholder for the BIOS setting part, which isn't implemented yet

File:

• trunk/src/VBox/Main/xml/Settings.cpp (modified) (11 diffs)

trunk/src/VBox/Main/xml/Settings.cpp

@@ -2155 +2155 @@
     fLogoFadeIn(true),
     fLogoFadeOut(true),
+    fPXEDebugEnabled(false),
     ulLogoDisplayTime(0),
     biosBootMenuMode(BIOSBootMenuMode_MessageAndMenu),
-    fPXEDebugEnabled(false),
+    apicMode(APICMode_APIC),
     llTimeOffset(0)
 {
@@ -2171 +2172 @@
         && fLogoFadeIn
         && fLogoFadeOut
+        && !fPXEDebugEnabled
         && ulLogoDisplayTime == 0
         && biosBootMenuMode == BIOSBootMenuMode_MessageAndMenu
-        && !fPXEDebugEnabled
-        && llTimeOffset == 0;
+        && apicMode == APICMode_APIC
+        && llTimeOffset == 0
+        && strLogoImagePath.isEmpty();
 }
 
@@ -2189 +2192 @@
             && fLogoFadeIn         == d.fLogoFadeIn
             && fLogoFadeOut        == d.fLogoFadeOut
+            && fPXEDebugEnabled    == d.fPXEDebugEnabled
             && ulLogoDisplayTime   == d.ulLogoDisplayTime
-            && strLogoImagePath    == d.strLogoImagePath
             && biosBootMenuMode    == d.biosBootMenuMode
-            && fPXEDebugEnabled    == d.fPXEDebugEnabled
-            && llTimeOffset        == d.llTimeOffset);
+            && apicMode            == d.apicMode
+            && llTimeOffset        == d.llTimeOffset
+            && strLogoImagePath    == d.strLogoImagePath);
 }
 
@@ -2692 +2696 @@
     fTripleFaultReset(false),
     fPAE(false),
+    fAPIC(true),
+    fX2APIC(false),
     enmLongMode(HC_ARCH_BITS == 64 ? Hardware::LongMode_Enabled : Hardware::LongMode_Disabled),
     cCPUs(1),
@@ -2842 +2848 @@
             && enmLongMode               == h.enmLongMode
             && fTripleFaultReset         == h.fTripleFaultReset
+            && fAPIC                     == h.fAPIC
+            && fX2APIC                   == h.fX2APIC
             && cCPUs                     == h.cCPUs
             && fCpuHotPlug               == h.fCpuHotPlug
@@ -3795 +3803 @@
                 pelmCPUChild->getAttributeValue("enabled", hw.fTripleFaultReset);
 
+            if ((pelmCPUChild = pelmHwChild->findChildElement("APIC")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fAPIC);
+            if ((pelmCPUChild = pelmHwChild->findChildElement("X2APIC")))
+                pelmCPUChild->getAttributeValue("enabled", hw.fX2APIC);
+
             if ((pelmCPUChild = pelmHwChild->findChildElement("CpuIdTree")))
                 readCpuIdTree(*pelmCPUChild, hw.llCpuIdLeafs);
@@ -4078 +4091 @@
             if ((pelmBIOSChild = pelmHwChild->findChildElement("IOAPIC")))
                 pelmBIOSChild->getAttributeValue("enabled", hw.biosSettings.fIOAPICEnabled);
+            if ((pelmBIOSChild = pelmHwChild->findChildElement("APIC")))
+            {
+                Utf8Str strAPIC;
+                if (pelmBIOSChild->getAttributeValue("mode", strAPIC))
+                {
+                    strAPIC.toUpper();
+                    if (strAPIC == "DISABLED")
+                        hw.biosSettings.apicMode = APICMode_Disabled;
+                    else if (strAPIC == "APIC")
+                        hw.biosSettings.apicMode = APICMode_APIC;
+                    else if (strAPIC == "X2APIC")
+                        hw.biosSettings.apicMode = APICMode_X2APIC;
+                    else
+                        throw ConfigFileError(this, pelmBIOSChild, N_("Invalid value '%s' in APIC/@mode attribute"), strAPIC.c_str());
+                }
+            }
             if ((pelmBIOSChild = pelmHwChild->findChildElement("Logo")))
             {
@@ -5100 +5129 @@
     // PAE has too crazy default handling, must always save this setting.
     pelmCPU->createChild("PAE")->setAttribute("enabled", hw.fPAE);
+    if (m->sv >= SettingsVersion_v1_16)
+    {
+    }
     if (m->sv >= SettingsVersion_v1_14 && hw.enmLongMode != Hardware::LongMode_Legacy)
     {
@@ -5108 +5140 @@
     if (hw.fTripleFaultReset)
         pelmCPU->createChild("TripleFaultReset")->setAttribute("enabled", hw.fTripleFaultReset);
+    if (m->sv >= SettingsVersion_v1_14)
+    {
+        if (hw.fX2APIC)
+            pelmCPU->createChild("X2APIC")->setAttribute("enabled", hw.fX2APIC);
+        else if (!hw.fAPIC)
+            pelmCPU->createChild("APIC")->setAttribute("enabled", hw.fAPIC);
+    }
     if (hw.cCPUs > 1)
         pelmCPU->setAttribute("count", hw.cCPUs);
@@ -5450 +5489 @@
         if (hw.biosSettings.fIOAPICEnabled)
             pelmBIOS->createChild("IOAPIC")->setAttribute("enabled", hw.biosSettings.fIOAPICEnabled);
+        if (hw.biosSettings.apicMode != APICMode_APIC)
+        {
+            const char *pcszAPIC;
+            switch (hw.biosSettings.apicMode)
+            {
+                case APICMode_Disabled:
+                    pcszAPIC = "Disabled";
+                    break;
+                case APICMode_APIC:
+                default:
+                    pcszAPIC = "APIC";
+                    break;
+                case APICMode_X2APIC:
+                    pcszAPIC = "X2APIC";
+                    break;
+            }
+            pelmBIOS->createChild("APIC")->setAttribute("mode", pcszAPIC);
+        }
 
         if (   !hw.biosSettings.fLogoFadeIn
@@ -6726 +6783 @@
     if (m->sv < SettingsVersion_v1_16)
     {
-        // VirtualBox 5.1 adds a NVMe storage controller, paravirt debug options, cpu profile.
+        // VirtualBox 5.1 adds a NVMe storage controller, paravirt debug
+        // options, cpu profile, APIC settings (CPU capability and BIOS).
 
         if (   hardwareMachine.strParavirtDebug.isNotEmpty()
-            || (!hardwareMachine.strCpuProfile.equals("host") && hardwareMachine.strCpuProfile.isNotEmpty())
+            || (!hardwareMachine.strCpuProfile.equals("host") && hardwareMachine.strCpuProfile.isNotEmpty()
+            || hardwareMachine.biosSettings.apicMode != APICMode_APIC
+            || !hardwareMachine.fAPIC
+            || hardwareMachine.fX2APIC)
            )
         {