Changeset 38718 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 12, 2011 3:56:52 PM (13 years ago)

Author:

vboxsync

Message:

Main: Fix wrong medium attachment references after "Restore Snapshot" by making a depth copy of them

Location:

trunk/src/VBox/Main/src-server

Files:

• MediumAttachmentImpl.cpp (modified) (2 diffs)
• SnapshotImpl.cpp (modified) (1 diff)

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

@@ -65 +65 @@
 struct MediumAttachment::Data
 {
-    Data()
-        : pMachine(NULL),
+    Data(Machine * const aMachine = NULL)
+        : pMachine(aMachine),
           fIsEjected(false)
     { }
@@ -166 +166 @@
 
 /**
+ *  Initializes the medium attachment object given another guest object
+ *  (a kind of copy constructor). This object makes a private copy of data
+ *  of the original object passed as an argument.
+ */
+HRESULT MediumAttachment::initCopy(Machine *aParent, MediumAttachment *aThat)
+{
+    LogFlowThisFunc(("aParent=%p, aThat=%p\n", aParent, aThat));
+
+    ComAssertRet(aParent && aThat, E_INVALIDARG);
+
+    /* Enclose the state transition NotReady->InInit->Ready */
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
+    m = new Data(aParent);
+    /* m->pPeer is left null */
+
+    AutoCaller thatCaller(aThat);
+    AssertComRCReturnRC(thatCaller.rc());
+
+    AutoReadLock thatlock(aThat COMMA_LOCKVAL_SRC_POS);
+    m->bd.attachCopy(aThat->m->bd);
+
+    /* Confirm a successful initialization */
+    autoInitSpan.setSucceeded();
+
+    return S_OK;
+}
+
+/**
  * Uninitializes the instance.
  * Called from FinalRelease().

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

@@ -1820 +1820 @@
             setModified(IsModified_Storage);
             mMediaData.backup();
-            mMediaData->mAttachments = pSnapshotMachine->mMediaData->mAttachments;
+            mMediaData->mAttachments.clear();
+            for (MediaData::AttachmentList::const_iterator it = pSnapshotMachine->mMediaData->mAttachments.begin();
+                 it != pSnapshotMachine->mMediaData->mAttachments.end();
+                 ++it)
+            {
+                ComObjPtr<MediumAttachment> pAttach;
+                pAttach.createObject();
+                pAttach->initCopy(this, *it);
+                mMediaData->mAttachments.push_back(pAttach);
+            }
 
             /* leave the locks before the potentially lengthy operation */