Changeset 18696 in vbox for trunk/src

Timestamp:

Apr 3, 2009 2:47:51 PM (16 years ago)

Author:

vboxsync

Message:

Ugly hack to swap slots 11 and 3 so 82545EM ends up in slot 11 (as in VMWare).

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -93 +93 @@
 #include <VBox/param.h>
 
+/* Comment out the following line to remove VMWare compatibility hack. */
+#define VMWARE_NET_IN_SLOT_11
 
 /**
@@ -1177 +1179 @@
      * Network adapters
      */
+#ifdef VMWARE_NET_IN_SLOT_11
+    bool fSwapSlots3and11 = false;
+#endif
     PCFGMNODE pDevPCNet = NULL;          /* PCNet-type devices */
     rc = CFGMR3InsertNode(pDevices, "pcnet", &pDevPCNet);                           RC_CHECK();
@@ -1232 +1237 @@
                 iPciDeviceNo = ulInstance - 4 + 16;
         }
+#ifdef VMWARE_NET_IN_SLOT_11
+        /* 
+         * Dirty hack for PCI slot compatibility with VMWare,
+         * it assigns slot 11 to the first network controller.
+         */
+        if (iPciDeviceNo == 3 && adapterType == NetworkAdapterType_I82545EM)
+        {
+            iPciDeviceNo = 11;
+            fSwapSlots3and11 = true;
+        }
+#endif
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", iPciDeviceNo);               RC_CHECK();
         Assert(!afPciDeviceNo[iPciDeviceNo]);
@@ -2338 +2354 @@
                 rc = CFGMR3InsertNode(pInst,    "Config", &pCfg);                       RC_CHECK();
                 rc = CFGMR3InsertInteger(pInst, "Trusted",              1); /* bool */  RC_CHECK();
+#ifdef VMWARE_NET_IN_SLOT_11
+                /* 
+                 * Dirty hack for PCI slot compatibility with VMWare,
+                 * it assigns slot 11 to the first network controller.
+                 */
+                unsigned iPciDeviceNo = 11;
+                if (fSwapSlots3and11)
+                    iPciDeviceNo = 3;
+                rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          iPciDeviceNo);  RC_CHECK();
+                Assert(!afPciDeviceNo[iPciDeviceNo]);
+                afPciDeviceNo[iPciDeviceNo] = true;
+#else
                 rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo",          11);            RC_CHECK();
                 Assert(!afPciDeviceNo[11]);
                 afPciDeviceNo[11] = true;
+#endif
                 rc = CFGMR3InsertInteger(pInst, "PCIFunctionNo",        0);             RC_CHECK();