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

Timestamp:

Apr 15, 2008 1:29:51 PM (17 years ago)

Author:

vboxsync

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

29641

Message:

Argh!

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp (modified) (5 diffs)

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

@@ -326 +326 @@
                  "                            [-acpi on|off]\n"
                  "                            [-ioapic on|off]\n"
+                 "                            [-pae on|off]\n"
                  "                            [-hwvirtex on|off|default]\n"
                  "                            [-monitorcount <number>]\n"
@@ -919 +920 @@
     else
         RTPrintf("IOAPIC:          %s\n", ioapicEnabled ? "on" : "off");
+
+    BOOL PAEEnabled;
+    machine->COMGETTER(PAEEnabled)(&PAEEnabled);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("pae=\"%s\"\n", PAEEnabled ? "on" : "off");
+    else
+        RTPrintf("PAE: %s\n", PAEEnabled ? "on" : "off");
 
     LONG64 timeOffset;
@@ -3714 +3722 @@
     char *acpi = NULL;
     char *hwvirtex = NULL;
+    char *pae = NULL;
     char *ioapic = NULL;
     int monitorcount = -1;
@@ -3850 +3859 @@
             hwvirtex = argv[i];
         }
+        else if (strcmp(argv[i], "-pae") == 0)
+        {
+            if (argc <= i + 1)
+            {
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            }
+            i++;
+            pae = argv[i];
+        }
         else if (strcmp(argv[i], "-monitorcount") == 0)
         {
@@ -4533 +4551 @@
             {
                 errorArgument("Invalid -hwvirtex argument '%s'", hwvirtex);
+                rc = E_FAIL;
+                break;
+            }
+        }
+        if (pae)
+        {
+            if (strcmp(pae, "on") == 0)
+            {
+                CHECK_ERROR(machine, COMSETTER(PAEEnabled)(true));
+            }
+            else if (strcmp(pae, "off") == 0)
+            {
+                CHECK_ERROR(machine, COMSETTER(PAEEnabled)(false));
+            }
+            else
+            {
+                errorArgument("Invalid -pae argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;