Changeset 48087 in vbox for trunk

Timestamp:

Aug 27, 2013 3:37:30 PM (12 years ago)

Author:

vboxsync

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

88462

Message:

Frontends/VirtualBox+VBoxManage: when unregistering a VM, also unregister the
hard disk images which are used exclusively (public bug #10311)

Location:

trunk

Files:

• doc/manual/user_ChangeLogImpl.xml (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp (modified) (1 diff)

trunk/doc/manual/user_ChangeLogImpl.xml

@@ -31 +31 @@
       <listitem>
         <para>GUI: host touch devices support (GUI passes host touch-events to guest)</para>
+      </listitem>
+
+      <listitem>
+        <para>GUI, VBoxManage: when unregistering a VM, also unregister the
+          hard disk images which are used exclusively (bug #10311)</para>
       </listitem>
 

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

@@ -154 +154 @@
                     RTEXITCODE_FAILURE);
     SafeIfaceArray<IMedium> aMedia;
-    CHECK_ERROR_RET(machine, Unregister(fDelete ? (CleanupMode_T)CleanupMode_DetachAllReturnHardDisksOnly : (CleanupMode_T)CleanupMode_DetachAllReturnNone,
+    CHECK_ERROR_RET(machine, Unregister(CleanupMode_DetachAllReturnHardDisksOnly,
                                         ComSafeArrayAsOutParam(aMedia)),
                     RTEXITCODE_FAILURE);
@@ -165 +165 @@
         rc = showProgress(pProgress);
         CHECK_PROGRESS_ERROR_RET(pProgress, ("Machine delete failed"), RTEXITCODE_FAILURE);
+    }
+    else
+    {
+        /* Note that the IMachine::Unregister method will return the medium
+         * reference in a sane order, which means that closing will normally
+         * succeed, unless there is still another machine which uses the
+         * medium. No harm done if we ignore the error. */
+        for (size_t i = 0; i < aMedia.size(); i++)
+        {
+            IMedium *pMedium = aMedia[i];
+            if (pMedium)
+                rc = pMedium->Close();
+        }
+        rc = S_OK;
     }
     return RTEXITCODE_SUCCESS;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -1492 +1492 @@
         else if (iResultCode == AlertButton_Choice2)
         {
-            /* Just unregister machine: */
-            machine.Unregister(KCleanupMode_DetachAllReturnNone);
+            /* Unregister machine first: */
+            CMediumVector mediums = machine.Unregister(KCleanupMode_DetachAllReturnHardDisksOnly);
             if (!machine.isOk())
             {
                 msgCenter().cannotRemoveMachine(machine);
                 continue;
+            }
+            /* Finally close all media, deliberately ignoring errors: */
+            foreach (CMedium medium, mediums)
+            {
+                if (!medium.isNull())
+                    medium.Close();
             }
         }