vbox的更動 28526 路徑 trunk/src/VBox/Main/MediumImpl.cpp

時間撮記:

2010-4-20 下午02:05:45 (15 年 以前)

作者:

vboxsync

訊息:

Main/MediumImpl: fix regression when creating diff images

檔案:

• trunk/src/VBox/Main/MediumImpl.cpp (修改) (8 筆差異)

trunk/src/VBox/Main/MediumImpl.cpp

@@ -2152 +2152 @@
     /* Apply the normal locking logic to the entire chain. */
     MediumLockList *pMediumLockList(new MediumLockList());
-    HRESULT rc = createMediumLockList(true, this, *pMediumLockList);
+    HRESULT rc = diff->createMediumLockList(true, this, *pMediumLockList);
     if (FAILED(rc))
     {
@@ -3101 +3101 @@
         pMedium = pMedium->getParent();
         if (pMedium.isNull() && pToBeParent)
+        {
             pMedium = pToBeParent;
+            pToBeParent = NULL;
+        }
     }
 
@@ -4162 +4165 @@
         else
             rc = createMediumLockList(false, NULL, *aMediumLockList);
-        if (FAILED(rc))
-        {
-            delete aMediumLockList;
-            aMediumLockList = NULL;
-            throw rc;
-        }
-
-        /* sanity checking */
+        if (FAILED(rc)) throw rc;
+
+        /* sanity checking, must be after lock list creation as it depends on
+         * valid medium states. The medium objects must be accessible. */
         {
             AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -4247 +4246 @@
 
         /* Update medium states appropriately */
-        switch (m->state)
-        {
-            case MediumState_Created:
-                m->state = MediumState_Deleting;
-                break;
-            default:
-                throw setStateError();
-        }
+        if (m->state == MediumState_Created)
+        {
+            rc = markForDeletion();
+            if (FAILED(rc)) throw rc;
+        }
+        else
+            throw setStateError();
+
         if (fMergeForward)
         {
@@ -4279 +4278 @@
         {
             AutoWriteLock alock(pLast COMMA_LOCKVAL_SRC_POS);
-            switch (pLast->m->state)
+            if (pLast->m->state == MediumState_Created)
             {
-                case MediumState_Created:
-                    pLast->m->state = MediumState_Deleting;
-                    break;
-                default:
-                    throw pLast->setStateError();
+                rc = pLast->markForDeletion();
+                if (FAILED(rc)) throw rc;
             }
+            else
+                throw pLast->setStateError();
         }
 
@@ -4507 +4505 @@
 
     AssertReturnVoid(aMediumLockList != NULL);
+
+    /* Revert media marked for deletion to previous state. */
+    HRESULT rc;
+    MediumLockList::Base::const_iterator mediumListBegin =
+        aMediumLockList->GetBegin();
+    MediumLockList::Base::const_iterator mediumListEnd =
+        aMediumLockList->GetEnd();
+    for (MediumLockList::Base::const_iterator it = mediumListBegin;
+         it != mediumListEnd;
+         ++it)
+    {
+        const MediumLock &mediumLock = *it;
+        const ComObjPtr<Medium> &pMedium = mediumLock.GetMedium();
+        AutoWriteLock alock(pMedium COMMA_LOCKVAL_SRC_POS);
+
+        if (pMedium->m->state == MediumState_Deleting)
+        {
+            rc = pMedium->unmarkForDeletion();
+            AssertComRC(rc);
+        }
+    }
 
     /* the destructor will do the work */
@@ -5025 +5044 @@
             MediumLockList::Base::const_iterator targetListEnd =
                 task.mpMediumLockList->GetEnd();
-            targetListEnd--;
             for (MediumLockList::Base::const_iterator it = targetListBegin;
                  it != targetListEnd;
@@ -5034 +5052 @@
 
                 AutoReadLock alock(pMedium COMMA_LOCKVAL_SRC_POS);
+
+                /* Skip over the target diff image */
+                if (pMedium->m->state == MediumState_Creating)
+                    continue;
 
                 /* sanity check */