Changeset 91130 in vbox

Timestamp:

Sep 6, 2021 7:00:34 PM (3 years ago)

Author:

vboxsync

Message:

Main/Machine: Allow specifying the empty string as the new location, which means the same as moving to the current location (which may move files other than the VM config).

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -9079 +9079 @@
       <desc>
         Move machine on to new place/folder
-        <result name="E_INVALIDARG">
-          @a target is @c null.
-        </result>
       </desc>
 
       <param name="folder" type="wstring" dir="in">
-        <desc>Target folder where machine is moved.</desc>
+        <desc>Target folder where machine is moved. May be the same folder
+          where the VM already is located or the empty string, in which
+          case the machine is kept in this location and the disk images
+          and other files which are stored elsewhere are moved.</desc>
       </param>
 

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -6975 +6975 @@
     if (SUCCEEDED(hrc))
     {
+        com::Utf8Str strDefaultPath;
+        if (aTargetPath.isEmpty())
+            i_calculateFullPath(".", strDefaultPath);
+
         /* Initialize our worker task */
         MachineMoveVM *pTask = NULL;
         try
         {
-            pTask = new MachineMoveVM(this, aTargetPath, aType, ptrProgress);
+            pTask = new MachineMoveVM(this, aTargetPath.isEmpty() ? strDefaultPath : aTargetPath, aType, ptrProgress);
         }
         catch (std::bad_alloc &)