Index: /trunk/src/VBox/Main/HostImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/HostImpl.cpp	(revision 31387)
+++ /trunk/src/VBox/Main/HostImpl.cpp	(revision 31388)
@@ -529,5 +529,5 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    std::list <ComObjPtr<HostNetworkInterface> > list;
+    std::list<ComObjPtr<HostNetworkInterface> > list;
 
 # ifdef VBOX_WITH_HOSTNETIF_API
@@ -1481,5 +1481,4 @@
     AutoMultiWriteLock2 alock(this->lockHandle(), &m->usbListsLock COMMA_LOCKVAL_SRC_POS);
 
-
     for (settings::USBDeviceFiltersList::const_iterator it = data.llUSBDeviceFilters.begin();
          it != data.llUSBDeviceFilters.end();
@@ -1514,6 +1513,5 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoReadLock alock1(this COMMA_LOCKVAL_SRC_POS);
-    AutoReadLock alock2(&m->usbListsLock COMMA_LOCKVAL_SRC_POS);
+    AutoReadLock alock(&m->usbListsLock COMMA_LOCKVAL_SRC_POS);
 
     data.llUSBDeviceFilters.clear();
Index: /trunk/src/VBox/Main/VirtualBoxImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/VirtualBoxImpl.cpp	(revision 31387)
+++ /trunk/src/VBox/Main/VirtualBoxImpl.cpp	(revision 31388)
@@ -3185,10 +3185,8 @@
     try
     {
-        // lock the lists while we're here
-        AutoReadLock machinesLock(m->allMachines.getLockHandle() COMMA_LOCKVAL_SRC_POS);
-
         // machines
         settings::MachinesRegistry machinesTemp;
         {
+            AutoReadLock machinesLock(m->allMachines.getLockHandle() COMMA_LOCKVAL_SRC_POS);
             for (MachinesOList::iterator it = m->allMachines.begin();
                  it != m->allMachines.end();
@@ -3274,4 +3272,6 @@
         }
 
+        mediaLock.release();
+
         settings::DHCPServersList dhcpServersTemp;
         {
@@ -3297,11 +3297,7 @@
         // leave extra data alone, it's still in the config file
 
-        /* host data (USB filters), will take host lock. */
-        {
-            mediaLock.release();
-            machinesLock.release();
-            rc = m->pHost->saveSettings(m->pMainConfigFile->host);
-            if (FAILED(rc)) throw rc;
-        }
+        // host data (USB filters)
+        rc = m->pHost->saveSettings(m->pMainConfigFile->host);
+        if (FAILED(rc)) throw rc;
 
         rc = m->pSystemProperties->saveSettings(m->pMainConfigFile->systemProperties);