Changeset 36058 in vbox for trunk/src/VBox/Main/include

Timestamp:

Feb 22, 2011 11:11:22 PM (14 years ago)

Author:

vboxsync

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

70171

Message:

Main/BandwidthControl: Don't use direct references to bandwidth group objects in the medium attachment object. It will point to the old uninitialized instance if the settings are changed. Uses the name of the bandwidth group now instead without changing the public interface to make a backport to 4.0 possible

Location:

trunk/src/VBox/Main/include

Files:

• MachineImpl.h (modified) (2 diffs)
• MediumAttachmentImpl.h (modified) (3 diffs)

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

@@ -33 +33 @@
 #include "StorageControllerImpl.h"          // required for MachineImpl.h to compile on Windows
 #include "BandwidthControlImpl.h"
+#include "BandwidthGroupImpl.h"
 #include "VBox/settings.h"
 #ifdef VBOX_WITH_RESOURCE_USAGE_API
@@ -716 +717 @@
     void releaseStateDependency();
 
+    HRESULT getBandwidthGroup(const Utf8Str &strBandwidthGroup,
+                              ComObjPtr<BandwidthGroup> &pBandwidthGroup,
+                              bool fSetError = false)
+    {
+        return mBandwidthControl->getBandwidthGroupByName(strBandwidthGroup,
+                                                          pBandwidthGroup,
+                                                          fSetError);
+    }
+
 protected:
 

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

@@ -48 +48 @@
                  DeviceType_T aType,
                  bool fPassthrough,
-                 BandwidthGroup *aBandwidthGroup);
+                 const Utf8Str &strBandwidthGroup);
     void uninit();
 
@@ -78 +78 @@
     DeviceType_T getType() const;
     bool getPassthrough() const;
-    const ComObjPtr<BandwidthGroup>& getBandwidthGroup() const;
+    const Utf8Str& getBandwidthGroup() const;
 
     bool matches(CBSTR aControllerName, LONG aPort, LONG aDevice);
@@ -89 +89 @@
 
     /** Must be called from under this object's write lock. */
-    void updateBandwidthGroup(const ComObjPtr<BandwidthGroup> &aBandwidthGroup);
+    void updateBandwidthGroup(const Utf8Str &aBandwidthGroup);
 
     /** Get a unique and somewhat descriptive name for logging. */