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

Timestamp:

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

Author:

vboxsync

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/include/MediumAttachmentImpl.h (modified) (4 diffs)

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

@@ -54 +54 @@
     HRESULT init(Machine *aParent,
                  Medium *aMedium,
-                 StorageController *aController,
+                 const Bstr &aControllerName,
                  LONG aPort,
                  LONG aDevice,
@@ -83 +83 @@
 
     const ComObjPtr<Medium> &medium() const { return m->medium; }
-    const ComObjPtr<StorageController> &controller() const { return m->controller; }
+    Bstr controllerName() const { return m->controllerName; }
     LONG port() const { return m->port; }
     LONG device() const { return m->device; }
@@ -89 +89 @@
     bool passthrough() const { AutoReadLock lock(this); return m->passthrough; }
 
-    bool matches(CBSTR aController, LONG aPort, LONG aDevice)
+    bool matches(CBSTR aControllerName, LONG aPort, LONG aDevice)
     {
-        return (    aController == m->controller->name()
+        return (    aControllerName == m->controllerName
                  && aPort == m->port
                  && aDevice == m->device);
@@ -125 +125 @@
 
         ComObjPtr<Medium> medium;
-        ComObjPtr<StorageController> controller;
+        /* Since MediumAttachment is not a first class citizen when it
+         * comes to managing settings, having a reference to the storage
+         * controller will not work - when settings are changed it will point
+         * to the old, uninitialized instance. Changing this requires
+         * substantial changes to MediumImpl.cpp. */
+        Bstr controllerName;
         const LONG port;
         const LONG device;