Changeset 38452 in vbox

Timestamp:

Aug 15, 2011 8:50:33 AM (14 years ago)

Author:

vboxsync

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

73500

Message:

Main/Medium: make CreateDiffMedium more convenient to use by associating the medium with a registry, and fix error handling in CloneTo by not attempting to save the config since this often causes spurious extra error messages

File:

• trunk/src/VBox/Main/src-server/MediumImpl.cpp (modified) (3 diffs)

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

@@ -2539 +2539 @@
     // locking: we need the tree lock first because we access parent pointers
     AutoReadLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS);
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AutoMultiWriteLock2 alock(this, diff COMMA_LOCKVAL_SRC_POS);
 
     if (m->type == MediumType_Writethrough)
@@ -2574 +2574 @@
                         diff->getLocationFull().c_str());
     }
+
+    Guid parentMachineRegistry;
+    if (getFirstRegistryMachineId(parentMachineRegistry))
+    {
+        /* since this medium has been just created it isn't associated yet */
+        diff->m->llRegistryIDs.push_back(parentMachineRegistry);
+    }
+
     treeLock.release();
     alock.release();
@@ -7236 +7244 @@
 
     // now, at the end of this task (always asynchronous), save the settings
+    if (SUCCEEDED(mrc))
     {
         // save the settings