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

Timestamp:

Jan 10, 2023 6:35:56 AM (2 years ago)

Author:

vboxsync

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

155131

Message:

reimplemented changes for bugref:10180 after seperating the changes from bugref:4787

File:

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

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

@@ -171 +171 @@
     { "--delete",       'd', RTGETOPT_REQ_NOTHING },
     { "-delete",        'd', RTGETOPT_REQ_NOTHING },    // deprecated
+    { "--delete-all",   'a', RTGETOPT_REQ_NOTHING },
+    { "-delete-all",    'a', RTGETOPT_REQ_NOTHING },    // deprecated
 };
 
@@ -178 +180 @@
     const char *VMName = NULL;
     bool fDelete = false;
+    bool fDeleteAll = false;
 
     int c;
@@ -191 +194 @@
             case 'd':   // --delete
                 fDelete = true;
+                break;
+
+            case 'a':   // --delete-all
+                fDeleteAll = true;
                 break;
 
@@ -224 +231 @@
                     RTEXITCODE_FAILURE);
     SafeIfaceArray<IMedium> aMedia;
-    CHECK_ERROR_RET(machine, Unregister(CleanupMode_DetachAllReturnHardDisksOnly,
+    CHECK_ERROR_RET(machine, Unregister(fDeleteAll ? CleanupMode_DetachAllReturnHardDisksAndVMRemovable
+                                                   :CleanupMode_DetachAllReturnHardDisksOnly,
                                         ComSafeArrayAsOutParam(aMedia)),
                     RTEXITCODE_FAILURE);
-    if (fDelete)
+    if (fDelete || fDeleteAll)
     {
         ComPtr<IProgress> pProgress;