Changeset 34266 in vbox

Timestamp:

Nov 22, 2010 8:42:39 PM (14 years ago)

Author:

vboxsync

Message:

PCI: use stable_sort() when sorting rules for more predicatble results, raise priority for chipset-specific rules

File:

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

trunk/src/VBox/Main/BusAssignmentManager.cpp

@@ -115 +115 @@
      *  Alternative approach is to assign separate slot to each device.
      */
-    {"piix3ide",      0, 31, 1,  1},
-    {"ahci",          0, 31, 2,  1},
-    {"smbus",         0, 31, 3,  1},
-    {"usb-ohci",      0, 31, 4,  1},
-    {"usb-ehci",      0, 31, 5,  1},
-    {"thermal",       0, 31, 6,  1},
+    {"piix3ide",      0, 31, 1,  2},
+    {"ahci",          0, 31, 2,  2},
+    {"smbus",         0, 31, 3,  2},
+    {"usb-ohci",      0, 31, 4,  2},
+    {"usb-ehci",      0, 31, 5,  2},
+    {"thermal",       0, 31, 6,  2},
 
     /* to make sure rule never used before rules assigning devices on it */
@@ -358 +358 @@
     AssertMsg(matchingRules.size() > 0, ("No rule for %s(%s)\n", pszName, pszAlias));
 
-    sort(matchingRules.begin(), matchingRules.end(), RuleComparator);
+    stable_sort(matchingRules.begin(), matchingRules.end(), RuleComparator);
 
     for (size_t iRule = 0; iRule < matchingRules.size(); iRule++)