Changeset 70932 in vbox for trunk/src

Timestamp:

Feb 9, 2018 12:54:37 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120764

Message:

PDMDevice.cpp: Try instantiate devices in instance order, unless 'Priority' overrides it.

File:

• trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR3/PDMDevice.cpp

@@ -244 +244 @@
 
     /*
-     * Sort the device array ascending on u32Order. (bubble)
+     * Sort (bubble) the device array ascending on u32Order and instance number
+     * for a device.
      */
     unsigned c = cDevs - 1;
@@ -251 +252 @@
         unsigned j = 0;
         for (i = 0; i < c; i++)
-            if (paDevs[i].u32Order > paDevs[i + 1].u32Order)
+            if (   paDevs[i].u32Order > paDevs[i + 1].u32Order
+                || (   paDevs[i].u32Order  == paDevs[i + 1].u32Order
+                    && paDevs[i].iInstance >  paDevs[i + 1].iInstance
+                    && paDevs[i].pDev      == paDevs[i + 1].pDev) )
             {
                 paDevs[cDevs] = paDevs[i + 1];