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

Timestamp:

Jul 16, 2008 11:48:19 AM (17 years ago)

Author:

vboxsync

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

33410

Message:

Added setting for nested paging (default on).

File:

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

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

@@ -336 +336 @@
                  "                            [-pae on|off]\n"
                  "                            [-hwvirtex on|off|default]\n"
+                 "                            [-nestedpaging on|off]\n"
                  "                            [-monitorcount <number>]\n"
                  "                            [-bioslogofadein on|off]\n"
@@ -982 +983 @@
             RTPrintf("Hardw. virt.ext: %s\n", hwVirtExEnabled == TSBool_True ? "on" : "off");
     }
+    BOOL HWVirtExNestedPagingEnabled;
+    machine->COMGETTER(HWVirtExNestedPagingEnabled)(&HWVirtExNestedPagingEnabled);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("nestedpaging=\"%s\"\n", HWVirtExNestedPagingEnabled ? "on" : "off");
+    else
+        RTPrintf("Nested Paging:   %s\n", HWVirtExNestedPagingEnabled ? "on" : "off");
 
     MachineState_T machineState;
@@ -3749 +3756 @@
     char *acpi = NULL;
     char *hwvirtex = NULL;
+    char *nestedpaging = NULL;
     char *pae = NULL;
     char *ioapic = NULL;
@@ -3874 +3882 @@
             hwvirtex = argv[i];
         }
+        else if (strcmp(argv[i], "-nestedpaging") == 0)
+        {
+            if (argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", argv[i]);
+            i++;
+            nestedpaging = argv[i];
+        }
         else if (strcmp(argv[i], "-pae") == 0)
         {
@@ -4496 +4511 @@
             {
                 errorArgument("Invalid -hwvirtex argument '%s'", hwvirtex);
+                rc = E_FAIL;
+                break;
+            }
+        }
+        if (nestedpaging)
+        {
+            if (strcmp(nestedpaging, "on") == 0)
+            {
+                CHECK_ERROR(machine, COMSETTER(HWVirtExNestedPagingEnabled)(true));
+            }
+            else if (strcmp(nestedpaging, "off") == 0)
+            {
+                CHECK_ERROR(machine, COMSETTER(HWVirtExNestedPagingEnabled)(false));
+            }
+            else
+            {
+                errorArgument("Invalid -nestedpaging argument '%s'", ioapic);
                 rc = E_FAIL;
                 break;