Changeset 23914 in vbox for trunk/src/VBox/Main/MediumAttachmentImpl.cpp

Timestamp:

Oct 20, 2009 4:31:36 PM (15 years ago)

Author:

vboxsync

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

53716

Message:

Main/MediumAttachment: very ugly fix for the fact that MediumAttachment instances can't have references to StorageController objects, because the reference would be invalid after changed settings are saved.

File:

• trunk/src/VBox/Main/MediumAttachmentImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -58 +58 @@
 HRESULT MediumAttachment::init(Machine *aParent,
                                Medium *aMedium,
-                               StorageController *aController,
+                               const Bstr &aControllerName,
                                LONG aPort,
                                LONG aDevice,
@@ -65 +65 @@
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aParent=%p aMedium=%p aController=%ls aPort=%d aDevice=%d aType=%d aImplicit=%d\n", aParent, aMedium, aController, aPort, aDevice, aType, aImplicit));
+    LogFlowThisFunc(("aParent=%p aMedium=%p aControllerName=%ls aPort=%d aDevice=%d aType=%d aImplicit=%d\n", aParent, aMedium, aControllerName.raw(), aPort, aDevice, aType, aImplicit));
 
     if (aType == DeviceType_HardDisk)
@@ -78 +78 @@
     m.allocate();
     m->medium = aMedium;
-    unconst(m->controller) = aController;
+    unconst(m->controllerName) = aControllerName;
     unconst(m->port)   = aPort;
     unconst(m->device) = aDevice;
@@ -190 +190 @@
 
     /* m->controller is constant during life time, no need to lock */
-    m->controller.queryInterfaceTo(aController);
-
-    LogFlowThisFuncLeave();
-    return S_OK;
+    /** @todo ugly hack, MediumAttachment should have a direct reference
+     * to the storage controller, but can't have that right now due to
+     * how objects are created for settings rollback support. */
+    HRESULT rc = mParent->GetStorageControllerByName(m->controllerName, aController);
+
+    LogFlowThisFuncLeave();
+    return rc;
 }