Changeset 24160 in vbox

Timestamp:

Oct 29, 2009 2:25:53 PM (15 years ago)

Author:

vboxsync

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

54099

Message:

Main: fixed fixupMedia() and reverted changes in r54089

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (4 diffs)
• include/MediumAttachmentImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2557 +2557 @@
 
     mMediaData.backup();
-
-    /* if a cd/dvd was attached to the atachment then better update it */
-    do
-    {
-        ComObjPtr<Medium> medium;
-        AutoWriteLock attLock(pAttach);
-        pAttach->updateMedium(medium, false /* aImplicit */, mData->mUuid);
-    } while (0);
 
     /* we cannot use erase (it) below because backup() above will create
@@ -2719 +2711 @@
         if (!medium.isNull())
             medium->attachTo(mData->mUuid);
-        pAttach->updateMedium(medium, false /* aImplicit */, mData->mUuid);
+        pAttach->updateMedium(medium, false /* aImplicit */);
     }
 
@@ -7015 +7007 @@
             MediumAttachment *pAttach = *it;
 
-            if (pAttach->type() == DeviceType_HardDisk)
+            pAttach->commit();
+
+            Medium* pMedium = pAttach->medium();
+
+            /** @todo convert all this Machine-based voodoo to MediumAttachment
+            * based commit logic. */
+            if (pAttach->isImplicit())
             {
-                pAttach->commit();
-
-                Medium* pMedium = pAttach->medium();
-
-                /** @todo convert all this Machine-based voodoo to MediumAttachment
-                * based commit logic. */
-                if (pAttach->isImplicit())
+                /* convert implicit attachment to normal */
+                pAttach->setImplicit(false);
+
+                if (aOnline && pMedium && pAttach->type() == DeviceType_HardDisk)
                 {
-                    /* convert implicit attachment to normal */
-                    pAttach->setImplicit(false);
-
-                    if (aOnline)
+                    rc = pMedium->LockWrite(NULL);
+                    AssertComRC(rc);
+
+                    mData->mSession.mLockedMedia.push_back(
+                        Data::Session::LockedMedia::value_type(
+                            ComPtr<IMedium>(pMedium), true));
+
+                    /* also, relock the old hard disk which is a base for the
+                    * new diff for reading if the VM is online */
+
+                    ComObjPtr<Medium> parent = pMedium->parent();
+                    /* make the relock atomic */
+                    AutoWriteLock parentLock (parent);
+                    rc = parent->UnlockWrite(NULL);
+                    AssertComRC(rc);
+                    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<IMedium>(parent), false));
+                }
+
+                continue;
+            }
+
+            if (pMedium)
+            {
+                /* was this medium attached before? */
+                for (MediaData::AttachmentList::iterator oldIt = oldAtts.begin();
+                     oldIt != oldAtts.end();
+                     ++oldIt)
+                {
+                    MediumAttachment *pOldAttach = *it;
+                    if (pOldAttach->medium().equalsTo(pMedium))
                     {
-                        rc = pMedium->LockWrite(NULL);
-                        AssertComRC(rc);
-
-                        mData->mSession.mLockedMedia.push_back(
-                            Data::Session::LockedMedia::value_type(
-                                ComPtr<IMedium>(pMedium), true));
-
-                        /* also, relock the old hard disk which is a base for the
-                        * new diff for reading if the VM is online */
-
-                        ComObjPtr<Medium> parent = pMedium->parent();
-                        /* make the relock atomic */
-                        AutoWriteLock parentLock (parent);
-                        rc = parent->UnlockWrite(NULL);
-                        AssertComRC(rc);
-                        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<IMedium>(parent), false));
-                    }
-
-                    continue;
-                }
-
-                if (pMedium)
-                {
-                    /* was this hard disk attached before? */
-                    for (MediaData::AttachmentList::iterator oldIt = oldAtts.begin();
-                         oldIt != oldAtts.end();
-                         ++oldIt)
-                    {
-                        MediumAttachment *pOldAttach = *it;
-                        if (pOldAttach->medium().equalsTo(pMedium))
-                        {
-                            /* yes: remove from old to avoid de-association */
-                            oldAtts.erase(oldIt);
-                            break;
-                        }
+                        /* yes: remove from old to avoid de-association */
+                        oldAtts.erase(oldIt);
+                        break;
                     }
                 }
@@ -7087 +7076 @@
             MediumAttachment *pAttach = *it;
 
-            if (pAttach->type() == DeviceType_HardDisk)
+            Medium* pMedium = pAttach->medium();
+
+            if (pMedium)
             {
-                Medium* pMedium = pAttach->medium();
-
-                if (pMedium)
+                /* now de-associate from the current machine state */
+                rc = pMedium->detachFrom(mData->mUuid);
+                AssertComRC(rc);
+
+                if (aOnline && pAttach->type() == DeviceType_HardDisk)
                 {
-                    /* now de-associate from the current machine state */
-                    rc = pMedium->detachFrom(mData->mUuid);
-                    AssertComRC(rc);
-
-                    if (aOnline)
-                    {
-                        /* unlock since not used anymore */
-                        MediumState_T state;
-                        rc = pMedium->UnlockWrite(&state);
-                        /* the disk may be alredy relocked for reading above */
-                        Assert (SUCCEEDED(rc) || state == MediumState_LockedRead);
-                    }
+                    /* unlock since not used anymore */
+                    MediumState_T state;
+                    rc = pMedium->UnlockWrite(&state);
+                    /* the disk may be alredy relocked for reading above */
+                    Assert (SUCCEEDED(rc) || state == MediumState_LockedRead);
                 }
             }

trunk/src/VBox/Main/include/MediumAttachmentImpl.h

@@ -96 +96 @@
 
     /** Must be called from under this object's write lock. */
-    void updateMedium(const ComObjPtr<Medium> &aMedium,
-                      bool aImplicit,
-                      const Guid &aMachineId = Guid::Empty)
+    void updateMedium(const ComObjPtr<Medium> &aMedium, bool aImplicit)
     {
         m.backup();
-        if (m->medium && aMachineId)
-            m->medium->detachFrom(aMachineId);
         m->medium = aMedium;
         m->implicit = aImplicit;