Changeset 31595 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 12, 2010 11:44:47 AM (14 years ago)

Author:

vboxsync

Message:

Main: remove deprecated VirtualBox::createLegacyMachine() and corresponding VBoxManage --settingsfile option; new API docs for IMachine::attachDevice() (not yet implemented)

File:

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

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

@@ -182 +182 @@
     HRESULT rc;
     Bstr baseFolder;
-    Bstr settingsFile;
     Bstr name;
     Bstr osTypeId;
@@ -198 +197 @@
             i++;
             baseFolder = a->argv[i];
-        }
-        else if (   !strcmp(a->argv[i], "--settingsfile")
-                 || !strcmp(a->argv[i], "-settingsfile"))
-        {
-            if (a->argc <= i + 1)
-                return errorArgument("Missing argument to '%s'", a->argv[i]);
-            i++;
-            settingsFile = a->argv[i];
         }
         else if (   !strcmp(a->argv[i], "--name")
@@ -243 +234 @@
         return errorSyntax(USAGE_CREATEVM, "Parameter --name is required");
 
-    if (!baseFolder.isEmpty() && !settingsFile.isEmpty())
-        return errorSyntax(USAGE_CREATEVM, "Cannot specify both --basefolder and --settingsfile together");
-
     do
     {
         ComPtr<IMachine> machine;
 
-        if (settingsFile.isEmpty())
-            CHECK_ERROR_BREAK(a->virtualBox,
-                CreateMachine(name, osTypeId, baseFolder, Guid(id).toUtf16(), FALSE, machine.asOutParam()));
-        else
-            CHECK_ERROR_BREAK(a->virtualBox,
-                CreateLegacyMachine(name, osTypeId, settingsFile, Guid(id).toUtf16(), machine.asOutParam()));
+        CHECK_ERROR_BREAK(a->virtualBox,
+                          CreateMachine(name,
+                                        osTypeId,
+                                        baseFolder,
+                                        Guid(id).toUtf16(),
+                                        FALSE,
+                                        machine.asOutParam()));
 
         CHECK_ERROR_BREAK(machine, SaveSettings());
@@ -264 +253 @@
         Bstr uuid;
         CHECK_ERROR_BREAK(machine, COMGETTER(Id)(uuid.asOutParam()));
+        Bstr settingsFile;
         CHECK_ERROR_BREAK(machine, COMGETTER(SettingsFilePath)(settingsFile.asOutParam()));
         RTPrintf("Virtual machine '%ls' is created%s.\n"