Changeset 55807 in vbox

Timestamp:

May 11, 2015 4:58:45 PM (10 years ago)

Author:

vboxsync

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

100247

Message:

Main/Machine: fix self-deadlock during inaccessible machine unregistration

Location:

trunk/src/VBox/Main

Files:

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

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

@@ -6523 +6523 @@
     </method>
 
-    <method name="unregister" wrap-hint-server="limitedcaller">
+    <method name="unregister" wrap-hint-server="limitedcaller,passcaller">
       <desc>
         Unregisters a machine previously registered with

trunk/src/VBox/Main/include/MachineImpl.h

@@ -1115 +1115 @@
     HRESULT saveSettings();
     HRESULT discardSettings();
-    HRESULT unregister(CleanupMode_T aCleanupMode,
+    HRESULT unregister(AutoCaller &aAutoCaller,
+                       CleanupMode_T aCleanupMode,
                        std::vector<ComPtr<IMedium> > &aMedia);
     HRESULT deleteConfig(const std::vector<ComPtr<IMedium> > &aMedia,

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

@@ -5065 +5065 @@
 
 /** @note Locks objects! */
-HRESULT Machine::unregister(CleanupMode_T aCleanupMode,
+HRESULT Machine::unregister(AutoCaller &autoCaller,
+                            CleanupMode_T aCleanupMode,
                             std::vector<ComPtr<IMedium> > &aMedia)
 {
-    // use AutoLimitedCaller because this call is valid on inaccessible machines as well
-    AutoLimitedCaller autoCaller(this);
-    AssertComRCReturnRC(autoCaller.rc());
-
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);