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

Timestamp:

Jul 17, 2012 12:23:50 PM (13 years ago)

Author:

vboxsync

Message:

Main+Frontends/VBoxManage: implement saving the settings, and add the matching VBoxManage support

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.h (modified) (2 diffs)
• VBoxManageHelp.cpp (modified) (3 diffs)
• VBoxManageMisc.cpp (modified) (7 diffs)
• VBoxManageModifyVM.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -24 +24 @@
 #include <VBox/com/VirtualBox.h>
 #include <VBox/com/string.h>
+#include <VBox/com/array.h>
 #endif /* !VBOX_ONLY_DOCS */
 
@@ -171 +172 @@
 
 /* VBoxManageModifyVM.cpp */
+#ifndef VBOX_ONLY_DOCS
+void parseGroups(const char *pcszGroups, com::SafeArray<BSTR> *pGroups);
+#endif
 int handleModifyVM(HandlerArg *a);
 

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

@@ -137 +137 @@
         RTStrmPrintf(pStrm,
                      "VBoxManage createvm         --name <name>\n"
+                     "                            [--groups <group>, ...]\n"
                      "                            [--ostype <ostype>]\n"
                      "                            [--register]\n"
@@ -148 +149 @@
                      "VBoxManage modifyvm         <uuid|name>\n"
                      "                            [--name <name>]\n"
+                     "                            [--groups <group>, ...]\n"
                      "                            [--ostype <ostype>]\n"
                      "                            [--memory <memorysize in MB>]\n"
@@ -355 +357 @@
                      "                                       keepdisknames]\n"
                      "                            [--name <name>]\n"
+                     "                            [--groups <group>, ...]\n"
                      "                            [--basefolder <basefolder>]\n"
                      "                            [--uuid <uuid>]\n"

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

@@ -191 +191 @@
     Bstr bstrBaseFolder;
     Bstr bstrName;
-    Bstr bstrGroups;
     Bstr bstrOsTypeId;
     Bstr bstrUuid;
     bool fRegister = false;
+    com::SafeArray<BSTR> groups;
 
     int c;
@@ -211 +211 @@
 
             case 'g':   // --groups
-                bstrGroups = ValueUnion.psz;
-                /// @todo implement group string parsing to safearray
+                parseGroups(ValueUnion.psz, &groups);
                 break;
 
@@ -242 +241 @@
     do
     {
+        Bstr bstrPrimaryGroup;
+        if (groups.size())
+            bstrPrimaryGroup = groups[0];
         Bstr bstrSettingsFile;
         CHECK_ERROR_BREAK(a->virtualBox,
                           ComposeMachineFilename(bstrName.raw(),
-                                                 NULL /* aGroup */,
+                                                 bstrPrimaryGroup.raw(),
                                                  bstrBaseFolder.raw(),
                                                  bstrSettingsFile.asOutParam()));
         ComPtr<IMachine> machine;
-        com::SafeArray<BSTR> groups; /* no groups */
         CHECK_ERROR_BREAK(a->virtualBox,
                           CreateMachine(bstrSettingsFile.raw(),
@@ -347 +348 @@
     com::SafeArray<CloneOptions_T> options;
     const char                    *pszTrgName       = NULL;
-    const char                    *pszTrgGroups     = NULL;
     const char                    *pszTrgBaseFolder = NULL;
     bool                           fRegister        = false;
     Bstr                           bstrUuid;
+    com::SafeArray<BSTR> groups;
 
     int c;
@@ -371 +372 @@
 
             case 'g':   // --groups
-                pszTrgGroups = ValueUnion.psz;
-                /// @todo implement group string parsing to safearray
+                parseGroups(ValueUnion.psz, &groups);
                 break;
 
@@ -435 +435 @@
         pszTrgName = RTStrAPrintf2("%s Clone", pszSrcName);
 
+    Bstr bstrPrimaryGroup;
+    if (groups.size())
+        bstrPrimaryGroup = groups[0];
     Bstr bstrSettingsFile;
     CHECK_ERROR_RET(a->virtualBox,
                     ComposeMachineFilename(Bstr(pszTrgName).raw(),
-                                           NULL /* aGroup */,
+                                           bstrPrimaryGroup.raw(),
                                            Bstr(pszTrgBaseFolder).raw(),
                                            bstrSettingsFile.asOutParam()),
@@ -444 +447 @@
 
     ComPtr<IMachine> trgMachine;
-    com::SafeArray<BSTR> groups; /* no groups */
     CHECK_ERROR_RET(a->virtualBox, CreateMachine(bstrSettingsFile.raw(),
                                                  Bstr(pszTrgName).raw(),

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

@@ -53 +53 @@
 {
     MODIFYVM_NAME = 1000,
+    MODIFYVM_GROUPS,
     MODIFYVM_OSTYPE,
     MODIFYVM_MEMORY,
@@ -196 +197 @@
 {
     { "--name",                     MODIFYVM_NAME,                      RTGETOPT_REQ_STRING },
+    { "--groups",                   MODIFYVM_GROUPS,                    RTGETOPT_REQ_STRING },
     { "--ostype",                   MODIFYVM_OSTYPE,                    RTGETOPT_REQ_STRING },
     { "--memory",                   MODIFYVM_MEMORY,                    RTGETOPT_REQ_UINT32 },
@@ -364 +366 @@
 }
 
+void parseGroups(const char *pcszGroups, com::SafeArray<BSTR> *pGroups)
+{
+    while (pcszGroups)
+    {
+        char *pComma = RTStrStr(pcszGroups, ",");
+        if (pComma)
+        {
+            Bstr(pcszGroups, pComma - pcszGroups).detachTo(pGroups->appendedRaw());
+            pcszGroups = pComma + 1;
+        }
+        else
+        {
+            Bstr(pcszGroups).detachTo(pGroups->appendedRaw());
+            pcszGroups = NULL;
+        }
+    }
+}
+
 int handleModifyVM(HandlerArg *a)
 {
@@ -405 +425 @@
             {
                 CHECK_ERROR(machine, COMSETTER(Name)(Bstr(ValueUnion.psz).raw()));
+                break;
+            }
+            case MODIFYVM_GROUPS:
+            {
+                com::SafeArray<BSTR> groups;
+                parseGroups(ValueUnion.psz, &groups);
+                CHECK_ERROR(machine, COMSETTER(Groups)(ComSafeArrayAsInParam(groups)));
                 break;
             }