Changeset 64406 in vbox

Timestamp:

Oct 24, 2016 7:25:03 PM (8 years ago)

Author:

vboxsync

Message:

PDMPCIDEVREG_DEV_NO_SAME_AS_PREV: Extended the search to previous PDM device instances in order to make it easier to do one PCI function per instance.

Location:

trunk

Files:

• include/VBox/vmm/pdmdev.h (modified) (1 diff)
• src/VBox/VMM/VMMR3/PDMDevHlp.cpp (modified) (1 diff)
• src/VBox/VMM/include/PDMInternal.h (modified) (1 diff)

trunk/include/VBox/vmm/pdmdev.h

@@ -2344 +2344 @@
 # define PDMPCIDEVREG_CFG_NEXT              UINT32_MAX
 /** Same device number as the previous PCI device registered with the PDM device.
- * This is handy when registering multiple PCI device functions
- * and the device number is left up to the PCI bus. */
+ * This is handy when registering multiple PCI device functions and the device
+ * number is left up to the PCI bus.  In order to facilitate on PDM device
+ * instance for each PCI function, this searches earlier PDM device
+ * instances as well. */
 # define PDMPCIDEVREG_DEV_NO_SAME_AS_PREV   UINT8_C(0xfd)
 /** Use the first unused device number (all functions must be unused). */

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

@@ -1299 +1299 @@
     if (uPciDevNo == PDMPCIDEVREG_DEV_NO_SAME_AS_PREV)
     {
-        AssertLogRelMsgReturn(pPrevPciDev, ("'%s'/%d: Can't use PDMPCIDEVREG_DEV_NO_SAME_AS_PREV with the first PCI device!\n",
-                                            pDevIns->pReg->szName, pDevIns->iInstance),
-                              VERR_WRONG_ORDER);
-        uPciDevNo = pPrevPciDev->uDevFn >> 3;
+        if (pPrevPciDev)
+            uPciDevNo = pPrevPciDev->uDevFn >> 3;
+        else
+        {
+            /* Look for PCI device registered with an earlier device instance so we can more
+               easily have multiple functions spanning multiple PDM device instances. */
+            PPDMPCIDEV pOtherPciDev = NULL;
+            PPDMDEVINS pPrevIns = pDevIns->Internal.s.pDevR3->pInstances;
+            while (pPrevIns != pDevIns && pPrevIns)
+            {
+                pOtherPciDev = pPrevIns->Internal.s.pHeadPciDevR3;
+                pPrevIns = pPrevIns->Internal.s.pNextR3;
+            }
+            Assert(pPrevIns == pDevIns);
+            AssertLogRelMsgReturn(pOtherPciDev,
+                                  ("'%s'/%d: Can't use PDMPCIDEVREG_DEV_NO_SAME_AS_PREV without a previously registered PCI device by the same or earlier PDM device instance!\n",
+                                   pDevIns->pReg->szName, pDevIns->iInstance),
+                                  VERR_WRONG_ORDER);
+
+            while (pOtherPciDev->Int.s.pNextR3)
+                pOtherPciDev = pOtherPciDev->Int.s.pNextR3;
+            uPciDevNo = pOtherPciDev->uDevFn >> 3;
+        }
     }
 

trunk/src/VBox/VMM/include/PDMInternal.h

@@ -142 +142 @@
     PVMR3                           pVMR3;
     /** Associated PCI device list head (first is default). (R3 ptr) */
-    R3PTRTYPE(PPDMPCIDEV)        pHeadPciDevR3;
+    R3PTRTYPE(PPDMPCIDEV)           pHeadPciDevR3;
 
     /** R0 pointer to the VM this instance was created for. */
     PVMR0                           pVMR0;
     /** Associated PCI device list head (first is default). (R0 ptr) */
-    R0PTRTYPE(PPDMPCIDEV)        pHeadPciDevR0;
+    R0PTRTYPE(PPDMPCIDEV)           pHeadPciDevR0;
 
     /** RC pointer to the VM this instance was created for. */
     PVMRC                           pVMRC;
     /** Associated PCI device list head (first is default). (RC ptr) */
-    RCPTRTYPE(PPDMPCIDEV)        pHeadPciDevRC;
+    RCPTRTYPE(PPDMPCIDEV)           pHeadPciDevRC;
 
     /** Flags, see PDMDEVINSINT_FLAGS_XXX. */