Changeset 18621 in vbox for trunk/src

Timestamp:

Apr 2, 2009 7:26:15 AM (16 years ago)

Author:

vboxsync

Message:

fix for xTracker #3762

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7445 +7445 @@
                     rc = hd->LockWrite (NULL);
                     AssertComRC (rc);
+                    
+                    mData->mSession.mLockedMedia.push_back (
+                        Data::Session::LockedMedia::value_type (
+                            ComPtr <IHardDisk> (hd), true));
 
                     /* also, relock the old hard disk which is a base for the
@@ -7456 +7460 @@
                     rc = parent->LockRead (NULL);
                     AssertComRC (rc);
+
+                    /* XXX actually we should replace the old entry in that
+                     * vector (write lock => read lock) but this would take
+                     * some effort. So lets just ignore the error code in
+                     * SessionMachine::unlockMedia(). */
+                    mData->mSession.mLockedMedia.push_back (
+                        Data::Session::LockedMedia::value_type (
+                            ComPtr <IHardDisk> (parent), false));
                 }
 
@@ -11076 +11088 @@
          it != mData->mSession.mLockedMedia.end(); ++ it)
     {
+        MediaState_T state;
         if (it->second)
-            rc = it->first->UnlockWrite (NULL);
+            rc = it->first->UnlockWrite (&state);
         else
-            rc = it->first->UnlockRead (NULL);
-
-        AssertComRC (rc);
+            rc = it->first->UnlockRead (&state);
+
+        /* the latter can happen if an object was re-locked in
+         * Machine::fixupHardDisks() */
+        Assert (SUCCEEDED (rc) || state == MediaState_LockedRead);
     }