Changeset 36276 in vbox for trunk/src/VBox/Main

Timestamp:

Mar 14, 2011 6:41:06 PM (14 years ago)

Author:

vboxsync

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

70550

Message:

Main/NetworkAdapter: Bandwidth group minor fixes (#5582)

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• src-server/NetworkAdapterImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -484 +484 @@
       <desc>Settings version "1.12", written by VirtualBox 4.1.x.</desc>
       <!--
-          Machine changes: raw PCI device attachment.
-      -->
-    </const>
-
-    <const name="v1_13"     value="15">
-      <desc>Settings version "1.13", written by VirtualBox 4.2.x.</desc>
-      <!--
+          Machine changes: raw PCI device attachment;
           NetworkAdapter changes: bandwidth group.
       -->
@@ -496 +490 @@
 
     <const name="Future"     value="99999">
-      <desc>Settings version greater than "1.13", written by a future VirtualBox version.</desc>
+      <desc>Settings version greater than "1.11", written by a future VirtualBox version.</desc>
     </const>
   </enum>

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

@@ -1262 +1262 @@
     {
         ComObjPtr<BandwidthGroup> group;
-        rc = bwctl->getBandwidthGroupByName(data.strBandwidthGroup, group, true); // TODO: set error?
+        rc = bwctl->getBandwidthGroupByName(data.strBandwidthGroup, group, true);
         if (FAILED(rc)) return rc;
     }
@@ -1606 +1606 @@
 {
     LogFlowThisFuncEnter();
-    CheckComArgOutPointerValid(aBwGroup);
 
     AutoCaller autoCaller(this);
@@ -1616 +1615 @@
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    //HRESULT hrc = S_OK;
 
     if (mData->mBandwidthGroup != aBwGroup)