Changeset 46036 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 13, 2013 5:03:47 PM (12 years ago)

Author:

vboxsync

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

85703

Message:

Frontends/VBoxManage: new option --longmode for modifyvm, for changing the corresponding guest CPU property, plus showing the current value with showvminfo.
doc/manual: document this option, the link is currently dangling as the GUI doesn't allow to control this setting yet

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManageHelp.cpp (modified) (2 diffs)
• VBoxManageInfo.cpp (modified) (2 diffs)
• VBoxManageModifyVM.cpp (modified) (4 diffs)

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

@@ -176 +176 @@
 #endif
                      "                            [--ioapic on|off]\n"
-                     "                            [--pae on|off]\n"
                      "                            [--hpet on|off]\n"
                      "                            [--hwvirtex on|off]\n"
@@ -183 +182 @@
                      "                            [--largepages on|off]\n"
                      "                            [--vtxvpid on|off]\n"
+                     "                            [--pae on|off]\n"
+                     "                            [--longmode on|off]\n"
                      "                            [--synthcpu on|off]\n"
                      "                            [--cpuidset <leaf> <eax> <ebx> <ecx> <edx>]\n"

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

@@ -547 +547 @@
 
     SHOW_ULONG_PROP(       machine, CPUCount,                   "cpus",                 "Number of CPUs", "");
-    SHOW_BOOLEAN_METHOD(   machine, GetCPUProperty(CPUPropertyType_Synthetic, &f), "synthcpu", "Synthetic Cpu");
+    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_Synthetic, &f), "synthcpu", "Synthetic CPU");
 
     if (details != VMINFO_MACHINEREADABLE)
@@ -667 +669 @@
     SHOW_BOOLEAN_PROP(biosSettings, ACPIEnabled,                "acpi",                 "ACPI");
     SHOW_BOOLEAN_PROP(biosSettings, IOAPICEnabled,              "ioapic",               "IOAPIC");
-    SHOW_BOOLEAN_METHOD(machine, GetCPUProperty(CPUPropertyType_PAE, &f), "pae",        "PAE");
     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

@@ -59 +59 @@
     MODIFYVM_IOAPIC,
     MODIFYVM_PAE,
+    MODIFYVM_LONGMODE,
     MODIFYVM_SYNTHCPU,
     MODIFYVM_HWVIRTEX,
@@ -217 +218 @@
     { "--ioapic",                   MODIFYVM_IOAPIC,                    RTGETOPT_REQ_BOOL_ONOFF },
     { "--pae",                      MODIFYVM_PAE,                       RTGETOPT_REQ_BOOL_ONOFF },
+    { "--longmode",                 MODIFYVM_LONGMODE,                  RTGETOPT_REQ_BOOL_ONOFF },
     { "--synthcpu",                 MODIFYVM_SYNTHCPU,                  RTGETOPT_REQ_BOOL_ONOFF },
     { "--hwvirtex",                 MODIFYVM_HWVIRTEX,                  RTGETOPT_REQ_BOOL_ONOFF },
@@ -542 +544 @@
             }
 
+            case MODIFYVM_LONGMODE:
+            {
+                CHECK_ERROR(machine, SetCPUProperty(CPUPropertyType_LongMode, ValueUnion.f));
+                break;
+            }
+
             case MODIFYVM_SYNTHCPU:
             {
@@ -613 +621 @@
                 break;
             }
-    
+
             case MODIFYVM_CPUS:
             {