vbox的更動 34587 路徑 trunk/src/VBox/Main/xml

時間撮記:

2010-12-1 下午08:30:02 (14 年 以前)

作者:

vboxsync

訊息:

Main: Bandwidth groups for disks (and later network)

This introduces two new interfaces. The first one named IBandwidthGroup
represents one I/O limit and can be assigned to several mediums which
share this limit (which works only for harddisk images with the disabled
host cache).
The second one IBandwdithControl manages the groups and can create new ones
and destroy them if not required anymore.

VBoxManage: commands to access the bandwidth groups

Syntax:
VBoxManage storageattach <uuid|vmname>

...
--bandwidthgroup <name>

--bandwidthgroup assigns the specified device to the given group.

VBoxManage bandwidthctl <uuid|vmname>

--name <name>
--add disk|network
--limit <megabytes per second>
--delete

The --name parameter gives the name of the bandwidth group.
--add creates a new group of the given type (only disk is implemented so far)

with the given name.

--limit sets the limit to the given amount of MB/s

Note that limit can be changed while the VM is running. The VM
will immediately pick up the new limit for the given group name.

--delete deletes the group with the given name if it isn't used anymore.

Trying to delete a still used group will result in an error.

Example:

VBoxManage bandwidthctl "Test VM" --name Limit --add disk --limit 20
Creates a group named Test having a 20 MB/s limit.

VBoxManage storageattach "Test VM" --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium test.vdi --bandwidthgroup Limit
Adds a new disk to the SATA controller and assigns the bandwidth group Limit to it.

VBoxManage storageattach "Test VM" --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium test.vdi --bandwidthgroup none
Removes the bandwidth limit from the disk.

VBoxManage bandwidthctl "Test VM" --name Limit --add disk --limit 10
Changes the limit of bandwidth group Limit to 10 MB/s. If the VM is running the limit will be picked up
immediately.

檔案:

• trunk/src/VBox/Main/xml/Settings.cpp (修改) (10 筆差異)

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

@@ -1634 +1634 @@
                   && (llGuestProperties         == h.llGuestProperties)
                   && (strNotificationPatterns   == h.strNotificationPatterns)
+                  && (ioSettings                == h.ioSettings)
                 )
             );
@@ -1652 +1653 @@
                   && (uuid                      == a.uuid)
                   && (strHostDriveSrc           == a.strHostDriveSrc)
-                  && (ulBandwidthLimit          == a.ulBandwidthLimit)
+                  && (strBwGroup                == a.strBwGroup)
                 )
            );
@@ -2656 +2657 @@
         else if (pelmHwChild->nameEquals("IO"))
         {
+            const xml::ElementNode *pelmBwGroups;
             const xml::ElementNode *pelmIoChild;
 
@@ -2662 +2664 @@
                 pelmIoChild->getAttributeValue("enabled", hw.ioSettings.fIoCacheEnabled);
                 pelmIoChild->getAttributeValue("size", hw.ioSettings.ulIoCacheSize);
+            }
+
+            if ((pelmBwGroups = pelmHwChild->findChildElement("BandwidthGroups")))
+            {
+                xml::NodesLoop nl2(*pelmBwGroups, "BandwidthGroup");
+                const xml::ElementNode *pelmBandwidthGroup;
+                while ((pelmBandwidthGroup = nl2.forAllNodes()))
+                {
+                    BandwidthGroup gr;
+                    Utf8Str strTemp;
+
+                    pelmBandwidthGroup->getAttributeValue("name", gr.strName);
+
+                    if (pelmBandwidthGroup->getAttributeValue("type", strTemp))
+                    {
+                        if (strTemp == "Disk")
+                            gr.enmType = BandwidthGroupType_Disk;
+                        else if (strTemp == "Network")
+                            gr.enmType = BandwidthGroupType_Network;
+                        else
+                            throw ConfigFileError(this, pelmBandwidthGroup, N_("Invalid value '%s' in BandwidthGroup/@type attribute"), strTemp.c_str());
+                    }
+                    else
+                        throw ConfigFileError(this, pelmBandwidthGroup, N_("Missing BandwidthGroup/@type attribute"));
+
+                    pelmBandwidthGroup->getAttributeValue("maxMbPerSec", gr.cMaxMbPerSec);
+                    hw.ioSettings.llBandwidthGroups.push_back(gr);
+                }
             }
         }
@@ -2878 +2908 @@
                     throw ConfigFileError(this, pelmImage, N_("Required AttachedDevice/@device attribute is missing"));
 
-                pelmAttached->getAttributeValue("bandwidthLimit", att.ulBandwidthLimit);
+                pelmAttached->getAttributeValue("bandwidthGroup", att.strBwGroup);
                 sctl.llAttachedDevices.push_back(att);
             }
@@ -3760 +3790 @@
         xml::ElementNode *pelmIo = pelmHardware->createChild("IO");
         xml::ElementNode *pelmIoCache;
-        xml::ElementNode *pelmIoBandwidth;
 
         pelmIoCache = pelmIo->createChild("IoCache");
         pelmIoCache->setAttribute("enabled", hw.ioSettings.fIoCacheEnabled);
         pelmIoCache->setAttribute("size", hw.ioSettings.ulIoCacheSize);
-        pelmIoBandwidth = pelmIo->createChild("IoBandwidth");
+
+        if (m->sv >= SettingsVersion_v1_11)
+        {
+            xml::ElementNode *pelmBandwidthGroups = pelmIo->createChild("BandwidthGroups");
+            for (BandwidthGroupList::const_iterator it = hw.ioSettings.llBandwidthGroups.begin();
+                 it != hw.ioSettings.llBandwidthGroups.end();
+                 ++it)
+            {
+                const BandwidthGroup &gr = *it;
+                const char *pcszType;
+                xml::ElementNode *pelmThis = pelmBandwidthGroups->createChild("BandwidthGroup");
+                pelmThis->setAttribute("name", gr.strName);
+                switch (gr.enmType)
+                {
+                    case BandwidthGroupType_Network: pcszType = "Network"; break;
+                    default: /* BandwidthGrouptype_Disk */ pcszType = "Disk"; break;
+                }
+                pelmThis->setAttribute("type", pcszType);
+                pelmThis->setAttribute("maxMbPerSec", gr.cMaxMbPerSec);
+            }
+        }
     }
 
@@ -4007 +4056 @@
             pelmDevice->setAttribute("device", att.lDevice);
 
-            if (att.ulBandwidthLimit)
-                pelmDevice->setAttribute("bandwidthLimit", att.ulBandwidthLimit);
+            if (att.strBwGroup.length())
+                pelmDevice->setAttribute("bandwidthGroup", att.strBwGroup);
 
             // attached image, if any
@@ -4325 +4374 @@
     {
         // VirtualBox 4.0 adds HD audio, CPU priorities, fault tolerance,
-        // per-machine media registries, VRDE and JRockitVE.
+        // per-machine media registries, VRDE, JRockitVE and bandwidth gorups.
         if (    hardwareMachine.audioAdapter.controllerType == AudioControllerType_HDA
              || hardwareMachine.ulCpuExecutionCap != 100
@@ -4338 +4387 @@
              || !hardwareMachine.vrdeSettings.strAuthLibrary.isEmpty()
              || machineUserData.strOsType == "JRockitVE"
+             || hardwareMachine.ioSettings.llBandwidthGroups.size()
            )
             m->sv = SettingsVersion_v1_11;
@@ -4437 +4487 @@
                 // Bandwidth limitations are new in VirtualBox 4.0 (1.11)
                 if (    (m->sv < SettingsVersion_v1_11)
-                     && (att.ulBandwidthLimit != 0)
+                     && (att.strBwGroup.length() != 0)
                    )
                 {