Changeset 19377 in vbox

Timestamp:

May 5, 2009 1:46:25 PM (16 years ago)

Author:

vboxsync

Message:

VBoxManage: Get and set CPUCount.

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

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

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

@@ -128 +128 @@
                  "                            [--nestedpaging on|off]\n"
                  "                            [--vtxvpid on|off]\n"
+                 "                            [--cpus <number>]\n"
                  "                            [--monitorcount <number>]\n"
                  "                            [--accelerate3d <on|off>]\n"

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

@@ -131 +131 @@
 
     /** @todo the quoting is not yet implemented! */
+    /** @todo error checking! */
 
     BOOL accessible = FALSE;
@@ -219 +220 @@
     else
         RTPrintf("VRAM size:       %uMB\n", vramSize);
+
+    ULONG numCpus;
+    rc = machine->COMGETTER(CPUCount)(&numCpus);
+    if (details == VMINFO_MACHINEREADABLE)
+        RTPrintf("cpus=%u\n", numCpus);
+    else
+        RTPrintf("Number of CPUs:  %u\n", numCpus);
 
     ComPtr <IBIOSSettings> biosSettings;

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

@@ -66 +66 @@
     char *vtxvpid = NULL;
     char *pae = NULL;
+    uint32_t numCpus = UINT32_MAX;
     char *ioapic = NULL;
     uint32_t monitorcount = ~0;
@@ -221 +222 @@
             pae = a->argv[i];
         }
+        else if (!strcmp(a->argv[i], "--cpus"))
+        {
+            if (a->argc <= i + 1)
+                return errorArgument("Missing argument to '%s'", a->argv[i]);
+            i++;
+            numCpus = RTStrToUInt32(a->argv[i]);
+            if (numCpus == UINT32_MAX)
+                return errorArgument("The number of cpus cannot be 0.", a->argv[i]);
+        }
         else if (   !strcmp(a->argv[i], "--monitorcount")
                  || !strcmp(a->argv[i], "-monitorcount"))
@@ -991 +1001 @@
             }
         }
+        if (numCpus != UINT32_MAX)
+        {
+            CHECK_ERROR(machine, COMSETTER(CPUCount)(numCpus));
+        }
         if (monitorcount != ~0U)
         {