Changeset 25142 in vbox

Timestamp:

Dec 2, 2009 12:02:25 PM (15 years ago)

Author:

vboxsync

Message:

VBoxManage: fix missing --memory option which was never parsed for some reason; add --cpu option since we do support multiple cpus now

Location:

trunk/src/VBox

Files:

• Frontends/VBoxManage/VBoxManageImport.cpp (modified) (3 diffs)
• Main/ApplianceImpl.cpp (modified) (1 diff)

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

@@ -94 +94 @@
     { "--vmname",               'V', RTGETOPT_REQ_STRING },
     { "-vmname",                'V', RTGETOPT_REQ_STRING },     // deprecated
+    { "--memory",               'm', RTGETOPT_REQ_STRING },
+    { "-memory",                'm', RTGETOPT_REQ_STRING },     // deprecated
+    { "--cpus",                 'c', RTGETOPT_REQ_STRING },
     { "--description",          'd', RTGETOPT_REQ_STRING },
     { "--eula",                 'L', RTGETOPT_REQ_STRING },
@@ -171 +174 @@
                     return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
                 mapArgsMapsPerVsys[ulCurVsys]["memory"] = ValueUnion.psz;
+                break;
+
+            case 'c':   // --cpus
+                if (ulCurVsys == (uint32_t)-1)
+                    return errorSyntax(USAGE_IMPORTAPPLIANCE, "Option \"%s\" requires preceding --vsys argument.", GetState.pDef->pszLong);
+                mapArgsMapsPerVsys[ulCurVsys]["cpus"] = ValueUnion.psz;
                 break;
 
@@ -453 +462 @@
 
                         case VirtualSystemDescriptionType_CPU:
-                            RTPrintf("%2u: Number of CPUs (ignored): %ls\n",
-                                     a, aVboxValues[a]);
+                            if (findArgValue(strOverride, pmapArgs, "cpus"))
+                            {
+                                uint32_t cCPUs;
+                                if (    (VINF_SUCCESS == strOverride.toInt(cCPUs))
+                                     && (cCPUs > 0)
+                                     && (cCPUs < 33)
+                                   )
+                                {
+                                    bstrFinalValue = strOverride;
+                                    RTPrintf("%2u: No. of CPUs specified with --cpus: %ls\n",
+                                             a, bstrFinalValue.raw());
+                                }
+                                else
+                                    return errorSyntax(USAGE_IMPORTAPPLIANCE,
+                                                       "Argument to --cpus option must be a number greater than 0 and less than 33.");
+                            }
+                            else
+                                RTPrintf("%2u: Number of CPUs: %ls\n    (change with \"--vsys %u --cpus <n>\")\n",
+                                         a, bstrFinalValue.raw(), i);
                         break;
 

trunk/src/VBox/Main/ApplianceImpl.cpp

@@ -1235 +1235 @@
 
             /* CPU count */
-            std::list<VirtualSystemDescriptionEntry*> vsdeCPU = vsdescThis->findByType (VirtualSystemDescriptionType_CPU);
+            std::list<VirtualSystemDescriptionEntry*> vsdeCPU = vsdescThis->findByType(VirtualSystemDescriptionType_CPU);
             ComAssertMsgThrow(vsdeCPU.size() == 1, ("CPU count missing"), E_FAIL);
             const Utf8Str &cpuVBox = vsdeCPU.front()->strVbox;