Changeset 93628 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Feb 6, 2022 11:44:05 PM (3 years ago)

Author:

vboxsync

Message:

VMM/PDMNetShaper,Main,DrvNetShaper: Moved the network shaper data off the hyper heap and into the VM structure. bugref:10093 bugref:5582

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -1464 +1464 @@
          * Bandwidth groups.
          */
+        ComPtr<IBandwidthControl> bwCtrl;
+        hrc = pMachine->COMGETTER(BandwidthControl)(bwCtrl.asOutParam());                   H();
+
+        com::SafeIfaceArray<IBandwidthGroup> bwGroups;
+        hrc = bwCtrl->GetAllBandwidthGroups(ComSafeArrayAsOutParam(bwGroups));              H();
+
         PCFGMNODE pAc;
+        InsertConfigNode(pPDM, "AsyncCompletion", &pAc);
         PCFGMNODE pAcFile;
+        InsertConfigNode(pAc,  "File", &pAcFile);
         PCFGMNODE pAcFileBwGroups;
-        ComPtr<IBandwidthControl> bwCtrl;
-        com::SafeIfaceArray<IBandwidthGroup> bwGroups;
-
-        hrc = pMachine->COMGETTER(BandwidthControl)(bwCtrl.asOutParam());                   H();
-
-        hrc = bwCtrl->GetAllBandwidthGroups(ComSafeArrayAsOutParam(bwGroups));              H();
-
-        InsertConfigNode(pPDM, "AsyncCompletion", &pAc);
-        InsertConfigNode(pAc,  "File", &pAcFile);
         InsertConfigNode(pAcFile,  "BwGroups", &pAcFileBwGroups);
 #ifdef VBOX_WITH_NETSHAPER
         PCFGMNODE pNetworkShaper;
+        InsertConfigNode(pPDM, "NetworkShaper",  &pNetworkShaper);
         PCFGMNODE pNetworkBwGroups;
-
-        InsertConfigNode(pPDM, "NetworkShaper",  &pNetworkShaper);
         InsertConfigNode(pNetworkShaper, "BwGroups", &pNetworkBwGroups);
 #endif /* VBOX_WITH_NETSHAPER */
@@ -1488 +1486 @@
         {
             Bstr strName;
-            LONG64 cMaxBytesPerSec;
-            BandwidthGroupType_T enmType;
-
             hrc = bwGroups[i]->COMGETTER(Name)(strName.asOutParam());                       H();
-            hrc = bwGroups[i]->COMGETTER(Type)(&enmType);                                   H();
-            hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                 H();
-
             if (strName.isEmpty())
                 return pVMM->pfnVMR3SetError(pUVM, VERR_CFGM_NO_NODE, RT_SRC_POS, N_("No bandwidth group name specified"));
+            BandwidthGroupType_T enmType = BandwidthGroupType_Null;
+            hrc = bwGroups[i]->COMGETTER(Type)(&enmType);                                   H();
+            LONG64 cMaxBytesPerSec = 0;
+            hrc = bwGroups[i]->COMGETTER(MaxBytesPerSec)(&cMaxBytesPerSec);                 H();
 
             if (enmType == BandwidthGroupType_Disk)