Changeset 36181 in vbox for trunk/src

Timestamp:

Mar 7, 2011 10:17:33 AM (14 years ago)

Author:

vboxsync

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

70383

Message:

Main: Fix crashes when starting a VM with a bandwidth group caused by a stale parent machine pointer

Location:

trunk/src/VBox/Main

Files:

• include/MediumAttachmentImpl.h (modified) (1 diff)
• src-server/MachineImpl.cpp (modified) (1 diff)
• src-server/MediumAttachmentImpl.cpp (modified) (3 diffs)

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

@@ -91 +91 @@
     void updateBandwidthGroup(const Utf8Str &aBandwidthGroup);
 
+    void updateParentMachine(Machine * const pMachine);
+
     /** Get a unique and somewhat descriptive name for logging. */
     const char* getLogName(void) const { return mLogName.c_str(); }

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

@@ -9591 +9591 @@
     if (isSessionMachine())
     {
+        /*
+         * Update the parent machine to point to the new owner.
+         * This is necessary because the stored parent will point to the
+         * session machine otherwise and cause crashes or errors later
+         * when the session machine gets invalid.
+         *
+         * @todo: Change the MediumAttachment class to behave like any other class
+         *        in this regard by creating peer MediumAttachment objects for
+         *        session machines and share the data with the peer machine.
+         */
+        for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin();
+             it != mMediaData->mAttachments.end();
+             ++it)
+        {
+            (*it)->updateParentMachine(mPeer);
+        }
+
         /* attach new data to the primary machine and reshare it */
         mPeer->mMediaData.attach(mMediaData);

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

@@ -281 +281 @@
 STDMETHODIMP MediumAttachment::COMGETTER(BandwidthGroup) (IBandwidthGroup **aBwGroup)
 {
+    LogFlowThisFuncEnter();
     CheckComArgOutPointerValid(aBwGroup);
 
@@ -300 +301 @@
     }
 
+    LogFlowThisFuncLeave();
     return hrc;
 }
@@ -426 +428 @@
 }
 
+void MediumAttachment::updateParentMachine(Machine * const pMachine)
+{
+    LogFlowThisFunc(("ENTER - %s\n", getLogName()));
+
+    /* sanity */
+    AutoCaller autoCaller(this);
+    AssertComRCReturnVoid (autoCaller.rc());
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    unconst(m->pMachine) = pMachine;
+
+    LogFlowThisFunc(("LEAVE - %s\n", getLogName()));
+}
+