Changeset 31301 in vbox

Timestamp:

Aug 2, 2010 1:33:24 PM (15 years ago)

Author:

vboxsync

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

64328

Message:

More resource control changes

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (3 diffs)
• MediumAttachmentImpl.cpp (modified) (4 diffs)
• include/MediumAttachmentImpl.h (modified) (1 diff)
• xml/Settings.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3477 +3477 @@
     ComObjPtr<MediumAttachment> attachment;
     attachment.createObject();
-    rc = attachment->init(this, medium, aControllerName, aControllerPort, aDevice, aType, indirect);
+    rc = attachment->init(this, medium, aControllerName, aControllerPort, aDevice, aType, indirect, 0 /* No bandwidth limit */);
     if (FAILED(rc)) return rc;
 
@@ -7165 +7165 @@
                                dev.lDevice,
                                dev.deviceType,
-                               dev.fPassThrough);
+                               dev.fPassThrough,
+                               dev.ulBandwidthLimit);
         if (FAILED(rc)) break;
 
@@ -8364 +8365 @@
                                   pAtt->getDevice(),
                                   DeviceType_HardDisk,
-                                  true /* aImplicit */);
+                                  true /* aImplicit */,
+                                  0 /* No bandwidth limit */);
             if (FAILED(rc)) throw rc;
 

trunk/src/VBox/Main/MediumAttachmentImpl.cpp

@@ -39 +39 @@
           type(DeviceType_Null),
           fPassthrough(false),
-          fImplicit(false)
+          fImplicit(false),
+          mBandwidthLimit(0)
     { }
 
@@ -92 +93 @@
  * Initializes the medium attachment object.
  *
- * @param aParent     Machine object.
- * @param aMedium     Medium object.
- * @param aController Controller the hard disk is attached to.
- * @param aPort       Port number.
- * @param aDevice     Device number on the port.
- * @param aPassthrough Wether accesses are directly passed to the host drive.
+ * @param aParent           Machine object.
+ * @param aMedium           Medium object.
+ * @param aController       Controller the hard disk is attached to.
+ * @param aPort             Port number.
+ * @param aDevice           Device number on the port.
+ * @param aPassthrough      Whether accesses are directly passed to the host drive.
+ * @param aBandwidthLimit   Bandwidth limit in Mbps
  */
 HRESULT MediumAttachment::init(Machine *aParent,
@@ -105 +107 @@
                                LONG aDevice,
                                DeviceType_T aType,
-                               bool aPassthrough)
+                               bool aPassthrough,
+                               ULONG aBandwidthLimit)
 {
     LogFlowThisFuncEnter();
@@ -133 +136 @@
     m->bd->fImplicit = false;
 
-    /* Default is no limit. */
-    m->bd->mBandwidthLimit = 0;
+    m->bd->mBandwidthLimit = aBandwidthLimit;
 
     /* Confirm a successful initialization when it's the case */

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

@@ -48 +48 @@
                  LONG aDevice,
                  DeviceType_T aType,
-                 bool fPassthrough);
+                 bool fPassthrough,
+                 ULONG aBandwidthLimit);
     void uninit();
 

trunk/src/VBox/Main/xml/Settings.cpp

@@ -1578 +1578 @@
                   && (uuid                      == a.uuid)
                   && (strHostDriveSrc           == a.strHostDriveSrc)
+                  && (ulBandwidthLimit          == a.ulBandwidthLimit)
                 )
            );
@@ -2754 +2755 @@
                     throw ConfigFileError(this, pelmImage, N_("Required AttachedDevice/@device attribute is missing"));
 
+                pelmAttached->getAttributeValue("bandwidthLimit", att.ulBandwidthLimit);
                 sctl.llAttachedDevices.push_back(att);
             }
@@ -3814 +3816 @@
             pelmDevice->setAttribute("device", att.lDevice);
 
+            if (att.ulBandwidthLimit)
+                pelmDevice->setAttribute("bandwidthLimit", att.ulBandwidthLimit);
+
             // attached image, if any
             if (    !att.uuid.isEmpty()
@@ -4153 +4158 @@
                     break; /* abort the loop -- we will not raise the version further */
                 }
+
+                /* Bandwidth limitations are new in VirtualBox 3.3 (1.11) */
+                if (att.ulBandwidthLimit != 0)
+                {
+                    m->sv = SettingsVersion_v1_11;
+                    break; /* abort the loop -- we will not raise the version further */
+                }
             }
         }