Changeset 31223 in vbox

Timestamp:

Jul 29, 2010 4:15:25 PM (14 years ago)

Author:

vboxsync

Message:

Main: error handling in Machine::Unregister()

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -4126 +4126 @@
                     llMedia.push_back(pMedium);
 
-                detachDevice(pAttach,
-                             alock,
-                             NULL /* pfNeedsSaveSettings */);
+                HRESULT rc = detachDevice(pAttach,
+                                          alock,
+                                          NULL /* pfNeedsSaveSettings */);
+                if (FAILED(rc))
+                    break;
             };
         }
@@ -4137 +4139 @@
     }
 
+    if (FAILED(rc))
+    {
+        rollbackMedia();
+        return rc;
+    }
+
     // commit all the media changes made above
     commitMedia();
@@ -4148 +4156 @@
     {
         // now go thru the list of attached media reported by prepareUnregister() and close them all
-        size_t u = 0;
         for (MediaList::const_iterator it = llMedia.begin();
              it != llMedia.end();
@@ -4159 +4166 @@
             if (FAILED(autoCaller2.rc())) return autoCaller2.rc();
 
-            pMedium->close(NULL /*fNeedsSaveSettings*/,     // we'll call saveSettings() in any case below
-                           autoCaller2);
+            ErrorInfoKeeper eik;
+            HRESULT rc = pMedium->close(NULL /*fNeedsSaveSettings*/,     // we'll call saveSettings() in any case below
+                                        autoCaller2);
                 // this uninitializes the medium
 
-            // report the path to the caller
-            llFilesForCaller.push_back(bstrFile);
-            ++u;
+            if (rc == VBOX_E_OBJECT_IN_USE)
+                // can happen if the medium was still attached to another machine;
+                // do not report the file to the caller then, but don't report
+                // an error either
+                eik.setNull();
+            else if (SUCCEEDED(rc))
+                // report the path to the caller
+                llFilesForCaller.push_back(bstrFile);
         }
     }