Changeset 81031 in vbox for trunk/src/VBox/Devices/VMMDev

Timestamp:

Sep 26, 2019 7:26:33 PM (5 years ago)

Author:

vboxsync

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

133634

Message:

PDM,Devices: Moving the PDMPCIDEV structures into the PDMDEVINS allocation. Preps for extending the config space to 4KB. bugref:9218

Location:

trunk/src/VBox/Devices/VMMDev

Files:

• VMMDev.cpp (modified) (8 diffs)
• VMMDevState.h (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

@@ -3203 +3203 @@
                                               RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
 {
-    RT_NOREF1(cb);
+    PVMMDEV pThis = PDMINS_2_DATA(pDevIns, PVMMDEV);
     LogFlow(("vmmdevR3IORAMRegionMap: iRegion=%d GCPhysAddress=%RGp cb=%RGp enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
-    PVMMDEV pThis = RT_FROM_MEMBER(pPciDev, VMMDEV, PciDev);
+    Assert(pPciDev == pDevIns->apPciDevs[0]);
+    RT_NOREF(cb, pPciDev);
+
     int rc;
 
@@ -3271 +3273 @@
                                                RTGCPHYS GCPhysAddress, RTGCPHYS cb, PCIADDRESSSPACE enmType)
 {
+    PVMMDEV pThis = PDMINS_2_DATA(pDevIns, PVMMDEV);
     LogFlow(("vmmdevIOPortRegionMap: iRegion=%d GCPhysAddress=%RGp cb=%RGp enmType=%d\n", iRegion, GCPhysAddress, cb, enmType));
-    RT_NOREF3(iRegion, cb, enmType);
-    PVMMDEV pThis = RT_FROM_MEMBER(pPciDev, VMMDEV, PciDev);
-
+    RT_NOREF(pPciDev, iRegion, cb, enmType);
+
+    Assert(pPciDev == pDevIns->apPciDevs[0]);
     Assert(enmType == PCI_ADDRESS_SPACE_IO);
     Assert(iRegion == 0);
@@ -4363 +4366 @@
 #endif
 
+    PPDMPCIDEV pPciDev = pDevIns->apPciDevs[0];
+    PDMPCIDEV_ASSERT_VALID(pDevIns, pPciDev);
+
     /* PCI vendor, just a free bogus value */
-    PCIDevSetVendorId(&pThis->PciDev, 0x80ee);
+    PDMPciDevSetVendorId(pPciDev,     0x80ee);
     /* device ID */
-    PCIDevSetDeviceId(&pThis->PciDev, 0xcafe);
+    PDMPciDevSetDeviceId(pPciDev,     0xcafe);
     /* class sub code (other type of system peripheral) */
-    PCIDevSetClassSub(&pThis->PciDev, 0x80);
+    PDMPciDevSetClassSub(pPciDev,       0x80);
     /* class base code (base system peripheral) */
-    PCIDevSetClassBase(&pThis->PciDev, 0x08);
+    PDMPciDevSetClassBase(pPciDev,      0x08);
     /* header type */
-    PCIDevSetHeaderType(&pThis->PciDev, 0x00);
+    PDMPciDevSetHeaderType(pPciDev,     0x00);
     /* interrupt on pin 0 */
-    PCIDevSetInterruptPin(&pThis->PciDev, 0x01);
+    PDMPciDevSetInterruptPin(pPciDev,   0x01);
 
     RTTIMESPEC TimeStampNow;
@@ -4559 +4565 @@
      * Register the PCI device.
      */
-    rc = PDMDevHlpPCIRegister(pDevIns, &pThis->PciDev);
+    rc = PDMDevHlpPCIRegister(pDevIns, pPciDev);
     if (RT_FAILURE(rc))
         return rc;
-    if (pThis->PciDev.uDevFn != 32 || iInstance != 0)
-        Log(("!!WARNING!!: pThis->PciDev.uDevFn=%d (ignore if testcase or no started by Main)\n", pThis->PciDev.uDevFn));
+    if (pPciDev->uDevFn != 32 || iInstance != 0)
+        Log(("!!WARNING!!: pThis->PciDev.uDevFn=%d (ignore if testcase or no started by Main)\n", pPciDev->uDevFn));
     rc = PDMDevHlpPCIIORegionRegister(pDevIns, 0, 0x20, PCI_ADDRESS_SPACE_IO, vmmdevIOPortRegionMap);
     if (RT_FAILURE(rc))
@@ -4583 +4589 @@
      * interrupt acknowledge requests more timely.
      */
-    rc = PDMDevHlpMMIO2Register(pDevIns, &pThis->PciDev, 1 /*iRegion*/, VMMDEV_RAM_SIZE, 0 /*fFlags*/,
+    rc = PDMDevHlpMMIO2Register(pDevIns, pPciDev, 1 /*iRegion*/, VMMDEV_RAM_SIZE, 0 /*fFlags*/,
                                 (void **)&pThis->pVMMDevRAMR3, "VMMDev");
     if (RT_FAILURE(rc))
@@ -4591 +4597 @@
     if (pThis->fRZEnabled)
     {
-        rc = PDMDevHlpMMIO2MapKernel(pDevIns, &pThis->PciDev, 1 /*iRegion*/, 0 /*off*/, PAGE_SIZE, "VMMDev", &pThis->pVMMDevRAMR0);
+        rc = PDMDevHlpMMIO2MapKernel(pDevIns, pPciDev, 1 /*iRegion*/, 0 /*off*/, PAGE_SIZE, "VMMDev", &pThis->pVMMDevRAMR0);
         if (RT_FAILURE(rc))
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
@@ -4597 +4603 @@
 
 #ifdef VBOX_WITH_RAW_MODE_KEEP
-        rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, &pThis->PciDev, 1 /*iRegion*/, 0 /*off*/, PAGE_SIZE, "VMMDev", &pThis->pVMMDevRAMRC);
+        rc = PDMDevHlpMMHyperMapMMIO2(pDevIns, pPciDev, 1 /*iRegion*/, 0 /*off*/, PAGE_SIZE, "VMMDev", &pThis->pVMMDevRAMRC);
         if (RT_FAILURE(rc))
             return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
@@ -4609 +4615 @@
     if (pThis->fHeapEnabled)
     {
-        rc = PDMDevHlpMMIO2Register(pDevIns, &pThis->PciDev, 2 /*iRegion*/, VMMDEV_HEAP_SIZE, 0 /*fFlags*/,
+        rc = PDMDevHlpMMIO2Register(pDevIns, pPciDev, 2 /*iRegion*/, VMMDEV_HEAP_SIZE, 0 /*fFlags*/,
                                     (void **)&pThis->pVMMDevHeapR3, "VMMDev Heap");
         if (RT_FAILURE(rc))

trunk/src/VBox/Devices/VMMDev/VMMDevState.h

@@ -121 +121 @@
 typedef struct VMMDevState
 {
-    /** The PCI device structure. */
-    PDMPCIDEV           PciDev;
     /** The critical section for this device.
      * @remarks We use this rather than the default one, it's simpler with all