Changeset 18710 in vbox for trunk/src/VBox

Timestamp:

Apr 3, 2009 6:38:34 PM (16 years ago)

Author:

vboxsync

Message:

Updated dirty hack to use slot 0x11 instead of 11.

File:

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

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1244 +1244 @@
         if (iPciDeviceNo == 3 && adapterType == NetworkAdapterType_I82545EM)
         {
-            iPciDeviceNo = 11;
+            iPciDeviceNo = 0x11;
             fSwapSlots3and11 = true;
         }
+        else if (iPciDeviceNo == 0x11 && fSwapSlots3and11)
+            iPciDeviceNo = 3;
 #endif
         rc = CFGMR3InsertInteger(pInst, "PCIDeviceNo", iPciDeviceNo);               RC_CHECK();
@@ -2321 +2323 @@
                 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();