Changeset 61042 in vbox for trunk/src/VBox/Frontends/VBoxManage

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

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManageInfo.cpp (modified) (3 diffs)
• VBoxManageModifyVM.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -681 +681 @@
                      "                            [--hpet on|off]\n"
                      "                            [--triplefaultreset on|off]\n"
+                     "                            [--apic on|off]\n"
+                     "                            [--x2apic on|off]\n"
                      "                            [--paravirtprovider none|default|legacy|minimal|\n"
                      "                                                hyperv|kvm]\n"
@@ -720 +722 @@
                      "                            [--bioslogoimagepath <imagepath>]\n"
                      "                            [--biosbootmenu disabled|menuonly|messageandmenu]\n"
+                     "                            [--biosapic disabled|apic|x2apic]\n"
                      "                            [--biossystemtimeoffset <msec>]\n"
                      "                            [--biospxedebug on|off]\n"

trunk/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -618 +618 @@
     SHOW_BOOLEAN_METHOD(   machine, GetCPUProperty(CPUPropertyType_PAE, &f), "pae", "PAE");
     SHOW_BOOLEAN_METHOD(   machine, GetCPUProperty(CPUPropertyType_LongMode, &f), "longmode", "Long Mode");
+    SHOW_BOOLEAN_METHOD(   machine, GetCPUProperty(CPUPropertyType_TripleFaultReset, &f), "triplefaultreset", "Triple Fault Reset");
+    SHOW_BOOLEAN_METHOD(   machine, GetCPUProperty(CPUPropertyType_APIC, &f), "apic", "APIC");
+    SHOW_BOOLEAN_METHOD(   machine, GetCPUProperty(CPUPropertyType_X2APIC, &f), "x2apic", "X2APIC");
     SHOW_ULONG_PROP(       machine, CPUIDPortabilityLevel, "cpuid-portability-level",   "CPUID Portability Level", "");
 
@@ -738 +741 @@
     SHOW_BOOLEAN_PROP(biosSettings, ACPIEnabled,                "acpi",                 "ACPI");
     SHOW_BOOLEAN_PROP(biosSettings, IOAPICEnabled,              "ioapic",               "IOAPIC");
+
+    APICMode_T apicMode;
+    CHECK_ERROR2I_RET(biosSettings, COMGETTER(APICMode)(&apicMode), hrcCheck);
+    const char *pszAPIC;
+    switch (apicMode)
+    {
+        case APICMode_Disabled:
+            pszAPIC = "disabled";
+            break;
+        case APICMode_APIC:
+        default:
+            if (details == VMINFO_MACHINEREADABLE)
+                pszAPIC = "apic";
+            else
+                pszAPIC = "APIC";
+            break;
+        case APICMode_X2APIC:
+            if (details == VMINFO_MACHINEREADABLE)
+                pszBootMenu = "x2apic";
+            else
+                pszBootMenu = "x2APIC";
+            break;
+    }
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("biosapic=\"%s\"\n", pszAPIC);
+    else
+        RTPrintf("BIOS APIC mode:  %s\n", pszAPIC);
+
     SHOW_LONG64_PROP(biosSettings,  TimeOffset,                 "biossystemtimeoffset", "Time offset",  "ms");
     SHOW_BOOLEAN_PROP_EX(machine,   RTCUseUTC,                  "rtcuseutc",            "RTC",          "UTC", "local time");

trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2015 Oracle Corporation
+ * Copyright (C) 2006-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -63 +63 @@
     MODIFYVM_CPUID_PORTABILITY,
     MODIFYVM_TFRESET,
+    MODIFYVM_APIC,
+    MODIFYVM_X2APIC,
     MODIFYVM_PARAVIRTPROVIDER,
     MODIFYVM_PARAVIRTDEBUG,
@@ -89 +91 @@
     MODIFYVM_BIOSLOGOIMAGEPATH,
     MODIFYVM_BIOSBOOTMENU,
+    MODIFYVM_BIOSAPIC,
     MODIFYVM_BIOSSYSTEMTIMEOFFSET,
     MODIFYVM_BIOSPXEDEBUG,
@@ -236 +239 @@
     { "--cpuid-portability-level",  MODIFYVM_CPUID_PORTABILITY,         RTGETOPT_REQ_UINT32 },
     { "--triplefaultreset",         MODIFYVM_TFRESET,                   RTGETOPT_REQ_BOOL_ONOFF },
+    { "--apic",                     MODIFYVM_APIC,                      RTGETOPT_REQ_BOOL_ONOFF },
+    { "--x2apic",                   MODIFYVM_X2APIC,                    RTGETOPT_REQ_BOOL_ONOFF },
     { "--paravirtprovider",         MODIFYVM_PARAVIRTPROVIDER,          RTGETOPT_REQ_STRING },
     { "--paravirtdebug",            MODIFYVM_PARAVIRTDEBUG,             RTGETOPT_REQ_STRING },
@@ -265 +270 @@
     { "--biosbootmenu",             MODIFYVM_BIOSBOOTMENU,              RTGETOPT_REQ_STRING },
     { "--biossystemtimeoffset",     MODIFYVM_BIOSSYSTEMTIMEOFFSET,      RTGETOPT_REQ_INT64 },
+    { "--biosapic",                 MODIFYVM_BIOSAPIC,                  RTGETOPT_REQ_STRING },
     { "--biospxedebug",             MODIFYVM_BIOSPXEDEBUG,              RTGETOPT_REQ_BOOL_ONOFF },
     { "--boot",                     MODIFYVM_BOOT,                      RTGETOPT_REQ_STRING | RTGETOPT_FLAG_INDEX },
@@ -672 +678 @@
             }
 
+            case MODIFYVM_APIC:
+            {
+                CHECK_ERROR(sessionMachine, SetCPUProperty(CPUPropertyType_APIC, ValueUnion.f));
+                break;
+            }
+
+            case MODIFYVM_X2APIC:
+            {
+                CHECK_ERROR(sessionMachine, SetCPUProperty(CPUPropertyType_X2APIC, ValueUnion.f));
+                break;
+            }
+
             case MODIFYVM_PARAVIRTPROVIDER:
             {
@@ -887 +905 @@
                 {
                     errorArgument("Invalid --biosbootmenu argument '%s'", ValueUnion.psz);
+                    rc = E_FAIL;
+                }
+                break;
+            }
+
+            case MODIFYVM_BIOSAPIC:
+            {
+                if (!RTStrICmp(ValueUnion.psz, "disabled"))
+                {
+                    CHECK_ERROR(biosSettings, COMSETTER(APICMode)(APICMode_Disabled));
+                }
+                else if (   !RTStrICmp(ValueUnion.psz, "apic")
+                         || !RTStrICmp(ValueUnion.psz, "lapic")
+                         || !RTStrICmp(ValueUnion.psz, "xapic"))
+                {
+                    CHECK_ERROR(biosSettings, COMSETTER(APICMode)(APICMode_APIC));
+                }
+                else if (!RTStrICmp(ValueUnion.psz, "x2apic"))
+                {
+                    CHECK_ERROR(biosSettings, COMSETTER(APICMode)(APICMode_X2APIC));
+                }
+                else
+                {
+                    errorArgument("Invalid --biosapic argument '%s'", ValueUnion.psz);
                     rc = E_FAIL;
                 }