Changeset 65891 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 27, 2017 4:22:19 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: use the chipset specific network card limit (except in one place which needs more work)

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• UIVMInfoDialog.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• runtime/information/UIInformationDataItem.cpp (modified) (2 diffs)
• selector/graphics/details/UIGDetailsElements.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsNetwork.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/UIVMInfoDialog.cpp

@@ -211 +211 @@
 
     /* Network statistics: */
-    ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
+    ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(machine.GetChipsetType());
     for (ulong i = 0; i < count; ++i)
     {

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -1257 +1257 @@
         QString item;
 
-        ulong count = m_vbox.GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
+        ulong count = m_vbox.GetSystemProperties().GetMaxNetworkAdapters(aMachine.GetChipsetType());
         int rows = 2; /* including section header and footer */
         for (ulong slot = 0; slot < count; slot ++)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationDataItem.cpp

@@ -403 +403 @@
             UITextTable p_text;
 
-            ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
+            ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(m_machine.GetChipsetType());
             for (ulong slot = 0; slot < count; slot++)
             {
@@ -804 +804 @@
 {
     /* Network statistics: */
-    ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
+    ulong count = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(m_machine.GetChipsetType());
     for (ulong i = 0; i < count; ++i)
     {

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp

@@ -592 +592 @@
         /* Iterate over all the adapters: */
         bool fSomeInfo = false;
-        ulong uSount = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3);
-        for (ulong uSlot = 0; uSlot < uSount; ++uSlot)
+        ulong uCount = vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(machine.GetChipsetType());
+        for (ulong uSlot = 0; uSlot < uCount; ++uSlot)
         {
             const CNetworkAdapter &adapter = machine.GetNetworkAdapter(uSlot);

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp

@@ -826 +826 @@
 
     /* How many adapters to display: */
+    /** @todo r=klaus this needs to be done based on the actual chipset type of the VM,
+     * but in this place the m_machine field isn't set yet. My observation (on Linux)
+     * is that the limitation to 4 isn't necessary any more, but this needs to be checked
+     * on all platforms to be certain that it's usable everywhere. */
     ulong uCount = qMin((ULONG)4, vboxGlobal().virtualBox().GetSystemProperties().GetMaxNetworkAdapters(KChipsetType_PIIX3));
     /* Add corresponding tab pages to parent tab widget: */