Changeset 34013 in vbox

Timestamp:

Nov 11, 2010 8:56:14 PM (14 years ago)

Author:

vboxsync

Message:

Main: few PCI assignment tweaks

File:

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

trunk/src/VBox/Main/BusAssignmentManager.cpp

@@ -44 +44 @@
 /* Those rules define PCI slots assignment */
 
+/* Device           Bus  Device Function Priority */ 
+
 /* Generic rules */
 static const DeviceAssignmentRule aGenericRules[] =
@@ -58 +60 @@
 
     /* Storage controllers */
-    {"ahci",          0, 13, 0,  0},
-    {"lsilogic",      0, 20, 0,  0},
-    {"buslogic",      0, 21, 0,  0},
-    {"lsilogicsas",   0, 22, 0,  0},
+    {"ahci",          0, 13, 0,  1},
+    {"lsilogic",      0, 20, 0,  1},
+    {"buslogic",      0, 21, 0,  1},
+    {"lsilogicsas",   0, 22, 0,  1},
 
     /* USB controllers */
@@ -73 +75 @@
     /* the first network card gets the PCI ID 3, the next 3 gets 8..10,
      * next 4 get 16..19. */
-    {"nic",           0,  3,  0, 0},
-    {"nic",           0,  8,  0, 0},
-    {"nic",           0,  9,  0, 0},
-    {"nic",           0, 10,  0, 0},
-    {"nic",           0, 16,  0, 0},
-    {"nic",           0, 17,  0, 0},
-    {"nic",           0, 18,  0, 0},
-    {"nic",           0, 19,  0, 0},
+    {"nic",           0,  3,  0, 1},
+    {"nic",           0,  8,  0, 1},
+    {"nic",           0,  9,  0, 1},
+    {"nic",           0, 10,  0, 1},
+    {"nic",           0, 16,  0, 1},
+    {"nic",           0, 17,  0, 1},
+    {"nic",           0, 18,  0, 1},
+    {"nic",           0, 19,  0, 1},
     /* VMWare assigns first NIC to slot 11 */
-    {"nic-vmware",    0, 11,  0, 0},
+    {"nic-vmware",    0, 11,  0, 1},
 
     /* ISA/LPC controller */
@@ -118 +120 @@
     {"usb-ehci",      0, 31, 5,  1},
     {"thermal",       0, 31, 6,  1},
-
-    /* ths rule has lower priority than generic one */
-    {"lsilogic",      1, 20, 0,  -1},
-    {"lsilogic",      1, 20, 0,  -1},
 
     /* to make sure rule never used before rules assigning devices on it */