Changeset 15000 in vbox

Timestamp:

Dec 4, 2008 7:04:23 PM (16 years ago)

Author:

vboxsync

Message:

Allow up to 8 network cards.

Location:

trunk/src/VBox

Files:

• Devices/Network/DevPCNet.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/xml/VirtualBox-settings-common.xsd (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevPCNet.cpp

@@ -5089 +5089 @@
     PDM_DEVREG_CLASS_NETWORK,
     /* cMaxInstances */
-    4,
+    8,
     /* cbInstance */
     sizeof(PCNetState),

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -958 +958 @@
         rc = CFGMR3InsertNode(pDev, szInstance, &pInst);                            RC_CHECK();
         rc = CFGMR3InsertInteger(pInst, "Trusted",              1); /* boolean */   RC_CHECK();
-        /* the first network card gets the PCI ID 3, the next 3 gets 8..10. */
-        const unsigned iPciDeviceNo = !ulInstance ? 3 : ulInstance - 1 + 8;
+        /* the first network card gets the PCI ID 3, the next 3 gets 8..10,
+         * next 4 get 16..19. */
+        unsigned iPciDeviceNo = 3;
+        if (ulInstance)
+        {
+            if (ulInstance < 4)
+                iPciDeviceNo = ulInstance - 1 + 8;
+            else
+                iPciDeviceNo = ulInstance - 4 + 16;
+        }
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", iPciDeviceNo);               RC_CHECK();
         Assert(!afPciDeviceNo[iPciDeviceNo]);

trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd

@@ -590 +590 @@
       <xsd:restriction base="xsd:unsignedInt">
         <xsd:minInclusive value="0"/>
-        <xsd:maxExclusive value="4"/>
+        <xsd:maxExclusive value="8"/>
       </xsd:restriction>
     </xsd:simpleType>