Changeset 31387 in vbox

Timestamp:

Aug 5, 2010 10:13:58 AM (14 years ago)

Author:

vboxsync

Message:

Main: Lock order when saving host usb filters.

Location:

trunk/src/VBox/Main

Files:

• HostImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/HostImpl.cpp

@@ -1514 +1514 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock(&m->usbListsLock COMMA_LOCKVAL_SRC_POS);
+    AutoReadLock alock1(this COMMA_LOCKVAL_SRC_POS);
+    AutoReadLock alock2(&m->usbListsLock COMMA_LOCKVAL_SRC_POS);
 
     data.llUSBDeviceFilters.clear();

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -3297 +3297 @@
         // leave extra data alone, it's still in the config file
 
-        /* host data (USB filters) */
-        rc = m->pHost->saveSettings(m->pMainConfigFile->host);
-        if (FAILED(rc)) throw rc;
+        /* host data (USB filters), will take host lock. */
+        {
+            mediaLock.release();
+            machinesLock.release();
+            rc = m->pHost->saveSettings(m->pMainConfigFile->host);
+            if (FAILED(rc)) throw rc;
+        }
 
         rc = m->pSystemProperties->saveSettings(m->pMainConfigFile->systemProperties);