Changeset 80722 in vbox for trunk/include

Timestamp:

Sep 11, 2019 9:21:47 AM (5 years ago)

Author:

vboxsync

Message:

PDM,PCI: More PDMPCIDEV related refactoring work, mainly concerned with eliminating unnecessary pointers. bugref:9218

Location:

trunk/include/VBox/vmm

Files:

• pdmdev.h (modified) (6 diffs)
• pdmpcidevint.h (modified) (5 diffs)

trunk/include/VBox/vmm/pdmdev.h

@@ -5035 +5035 @@
     RTR3PTR                         pvInstanceDataForRCR3;
 
+    /** Pointer to the PCI devices for this device.
+     * (Allocated after the shared instance data.)  */
+    R3PTRTYPE(struct PDMPCIDEV *)   apPciDevs[8];
+
     /** Temporarily. */
     R0PTRTYPE(struct PDMDEVINSR0 *) pDevInsR0RemoveMe;
@@ -5059 +5063 @@
 
 /** Current PDMDEVINSR3 version number. */
-#define PDM_DEVINSR3_VERSION        PDM_VERSION_MAKE(0xff82, 1, 0)
+#define PDM_DEVINSR3_VERSION        PDM_VERSION_MAKE(0xff82, 2, 0)
 
 /** Converts a pointer to the PDMDEVINSR3::IBase to a pointer to PDMDEVINS. */
@@ -5107 +5111 @@
     /** Ring-0 pointer to the raw-mode instance data. */
     RTR0PTR                         pvInstanceDataForRCR0;
+
+    /** Pointer to the PCI devices for this device.
+     * (Allocated after the shared instance data.)  */
+    R0PTRTYPE(struct PDMPCIDEV *)   apPciDevs[8];
+
 #if HC_ARCH_BITS == 32
     /** Align the internal data more naturally. */
@@ -5127 +5136 @@
 
 /** Current PDMDEVINSR0 version number. */
-#define PDM_DEVINSR0_VERSION        PDM_VERSION_MAKE(0xff83, 1, 0)
+#define PDM_DEVINSR0_VERSION        PDM_VERSION_MAKE(0xff83, 2, 0)
 
 
@@ -5158 +5167 @@
      */
     RGPTRTYPE(PPDMCRITSECT)         pCritSectRoRC;
-    /** Pointer to the ring-0 device registration structure.  */
-    RGPTRTYPE(PCPDMDEVREGR0)        pReg;
+    /** Pointer to the raw-mode device registration structure.  */
+    RGPTRTYPE(PCPDMDEVREGRC)        pReg;
+    /** Pointer to the PCI devices for this device.
+     * (Allocated after the shared instance data.)  */
+    RGPTRTYPE(struct PDMPCIDEV *)   apPciDevs[8];
 
     /** Internal data. */
@@ -5176 +5188 @@
 
 /** Current PDMDEVINSR0 version number. */
-#define PDM_DEVINSRC_VERSION        PDM_VERSION_MAKE(0xff84, 1, 0)
+#define PDM_DEVINSRC_VERSION        PDM_VERSION_MAKE(0xff84, 2, 0)
 
 

trunk/include/VBox/vmm/pdmpcidevint.h

@@ -132 +132 @@
     /** Pointer to the next PDM device associate with the PDM device. (R3 ptr) */
     R3PTRTYPE(PPDMPCIDEV)           pNextR3;
-    /** Pointer to the internal PDM PCI bus for the device. (R3 ptr) */
-    R3PTRTYPE(struct PDMPCIBUS *)   pPdmBusR3;
-
-    /** Pointer to the PDM device the PCI device belongs to. (R0 ptr)  */
-    PPDMDEVINSR0                    pDevInsR0;
     /** Pointer to the next PDM device associate with the PDM device. (R0 ptr) */
     R0PTRTYPE(PPDMPCIDEV)           pNextR0;
-    /** Pointer to the internal PDM PCI bus for the device. (R0 ptr) */
-    R0PTRTYPE(struct PDMPCIBUS *)   pPdmBusR0;
-
-    /** Pointer to the PDM device the PCI device belongs to. (RC ptr)  */
-    PPDMDEVINSRC                    pDevInsRC;
-    /** Pointer to the next PDM device associate with the PDM device. (RC ptr) */
-    RCPTRTYPE(PPDMPCIDEV)           pNextRC;
-    /** Pointer to the internal PDM PCI bus for the device. (RC ptr) */
-    RCPTRTYPE(struct PDMPCIBUS *)   pPdmBusRC;
 
     /** The CFGM device configuration index (default, PciDev1..255).
@@ -156 +142 @@
     /** Set if the it can be reassigned to a different PCI function number. */
     bool                            fReassignableFunNo;
-    /** Alignment padding.   */
+    /** Alignment padding - used by ICH9 for region swapping (DevVGA hack).   */
     uint8_t                         bPadding0;
+    /** Index into the PDM internal bus array (PDM::aPciBuses). */
+    uint8_t                         idxPdmBus;
+    /** Index into PDMDEVINSR3::apPciDevs. */
+    uint8_t                         idxPciDevs;
+
+    /** Alignment padding. */
+    uint8_t                         abPadding1[2+4+4];
+    RTR0PTR                         apR0PaddingPdm2[2];
+    RTR3PTR                         pR3PaddingPdm3;
     /** @} */
 
@@ -166 +161 @@
     /** Pointer to the PCI bus of the device. (R3 ptr) */
     R3PTRTYPE(struct DEVPCIBUS *)   pBusR3;
-    /** Page used for MSI-X state.             (R3 ptr) */
+    /** Page used for MSI-X state.            (R3 ptr) */
     R3PTRTYPE(void *)               pMsixPageR3;
     /** Read config callback. */
@@ -179 +174 @@
     R3PTRTYPE(PFNPCIBRIDGECONFIGWRITE) pfnBridgeConfigWrite;
 
-    /** Pointer to the PCI bus of the device. (R0 ptr) */
+    /** Pointer to the PCI bus of the device. (R0 ptr)
+     * @note Only used by ich9pcibridgeSetIrq to find the host (root) bus. */
     R0PTRTYPE(struct DEVPCIBUS *)   pBusR0;
-    /** Page used for MSI-X state.             (R0 ptr) */
+    /** Page used for MSI-X state.            (R0 ptr) */
     R0PTRTYPE(void *)               pMsixPageR0;
 
-    /** Pointer to the PCI bus of the device. (RC ptr) */
+    /** Pointer to the PCI bus of the device. (RC ptr)
+     * @note Only used by ich9pcibridgeSetIrq to find the host (root) bus. */
     RCPTRTYPE(struct DEVPCIBUS *)   pBusRC;
-    /** Page used for MSI-X state.             (RC ptr) */
+    /** Page used for MSI-X state.            (RC ptr) */
     RCPTRTYPE(void *)               pMsixPageRC;
 
@@ -212 +209 @@
 #if HC_ARCH_BITS == 32
     /** Add padding to align aIORegions to an 8 byte boundary. */
-    uint8_t                         abPadding1[12];
+    uint8_t                         abPadding2[12];
 #endif