Changeset 31333 in vbox for trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

Timestamp:

Aug 3, 2010 1:00:54 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

64371

Message:

Main: rework new implementation of Machine::Unregister() and Machine::Delete() to be more flexible and still easy to use

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (1 diff)

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

@@ -159 +159 @@
     if (machine)
     {
-        SafeArray<BSTR> abstrFiles;
-        CHECK_ERROR(machine, Unregister(fDelete /* fAutoCleanup */,
-                                        ComSafeArrayAsOutParam(abstrFiles)));
+        SafeIfaceArray<IMedium> aMedia;
+        CleanupMode_T cleanupMode = CleanupMode_DetachAllReturnNone;
+        if (fDelete)
+            cleanupMode = CleanupMode_DetachAllReturnHardDisksOnly;
+        CHECK_ERROR(machine, Unregister(cleanupMode,
+                                        ComSafeArrayAsOutParam(aMedia)));
         if (SUCCEEDED(rc))
         {
-            for (size_t u = 0;
-                 u < abstrFiles.size();
-                 ++u)
-            {
-                Utf8Str strFile(abstrFiles[u]);
-                if (fDelete)
-                {
-                    RTPrintf("Deleting '%s'\n", strFile.c_str());
-                    RTFileDelete(strFile.c_str());
-                }
-                else
-                    RTPrintf("File '%s' is now obsolete and can be deleted\n", strFile.c_str());
-            }
-
             if (fDelete)
             {
-                CHECK_ERROR(machine, Delete());
+                ComPtr<IProgress> pProgress;
+                CHECK_ERROR(machine, Delete(ComSafeArrayAsInParam(aMedia), pProgress.asOutParam()));
+                CHECK_ERROR(pProgress, WaitForCompletion(-1));
             }
         }