Changeset 91928 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Oct 21, 2021 9:09:51 AM (3 years ago)

Author:

vboxsync

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

147733

Message:

VMM,Devices: Eliminate direct calls to PGMHandlerPhysical* APIs and introduce callbacks in the device helper callback table, bugref:10074

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (2 diffs)
• DevVGA-SVGA.cpp (modified) (6 diffs)
• DevVGA.cpp (modified) (9 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA-cmd.cpp

@@ -592 +592 @@
         for (uint32_t i = 0; i < pGbo->cDescriptors; ++i)
         {
-            rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pSvgaR3State->pDevIns),
-                                            pGbo->paDescriptors[i].GCPhys, pGbo->paDescriptors[i].GCPhys + pGbo->paDescriptors[i].cPages * PAGE_SIZE - 1,
-                                            pSvgaR3State->hGboAccessHandlerType, pSvgaR3State->pDevIns, NIL_RTR0PTR, NIL_RTRCPTR, "VMSVGA GBO");
+            rc = PDMDevHlpPGMHandlerPhysicalRegister(pSvgaR3State->pDevIns,
+                                                     pGbo->paDescriptors[i].GCPhys, pGbo->paDescriptors[i].GCPhys + pGbo->paDescriptors[i].cPages * PAGE_SIZE - 1,
+                                                     pSvgaR3State->hGboAccessHandlerType, pSvgaR3State->pDevIns, NIL_RTR0PTR, NIL_RTRCPTR, "VMSVGA GBO");
             AssertRC(rc);
         }
@@ -611 +611 @@
             for (uint32_t i = 0; i < pGbo->cDescriptors; ++i)
             {
-                int rc = PGMHandlerPhysicalDeregister(PDMDevHlpGetVM(pSvgaR3State->pDevIns), pGbo->paDescriptors[i].GCPhys);
+                int rc = PDMDevHlpPGMHandlerPhysicalDeregister(pSvgaR3State->pDevIns, pGbo->paDescriptors[i].GCPhys);
                 AssertRC(rc);
             }

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -2861 +2861 @@
     for (uint32_t i = 0; i < pGMR->numDescriptors; i++)
     {
-        rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns),
-                                        pGMR->paDesc[i].GCPhys, pGMR->paDesc[i].GCPhys + pGMR->paDesc[i].numPages * PAGE_SIZE - 1,
-                                        pThis->svga.hGmrAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR, "VMSVGA GMR");
+        rc = PDMDevHlpPGMHandlerPhysicalRegister(pDevIns,
+                                                 pGMR->paDesc[i].GCPhys, pGMR->paDesc[i].GCPhys + pGMR->paDesc[i].numPages * PAGE_SIZE - 1,
+                                                 pThis->svga.hGmrAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR, "VMSVGA GMR");
         AssertRC(rc);
     }
@@ -2878 +2878 @@
     for (uint32_t i = 0; i < pGMR->numDescriptors; i++)
     {
-        int rc = PGMHandlerPhysicalDeregister(PDMDevHlpGetVM(pDevIns), pGMR->paDesc[i].GCPhys);
+        int rc = PDMDevHlpPGMHandlerPhysicalDeregister(pDevIns, pGMR->paDesc[i].GCPhys);
         AssertRC(rc);
     }
@@ -2897 +2897 @@
             for (uint32_t j = 0; j < pGMR->numDescriptors; j++)
             {
-                int rc = PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pGMR->paDesc[j].GCPhys);
+                int rc = PDMDevHlpPGMHandlerPhysicalReset(pDevIns, pGMR->paDesc[j].GCPhys);
                 AssertRC(rc);
             }
@@ -4580 +4580 @@
             {
 # ifdef VMSVGA_USE_FIFO_ACCESS_HANDLER
-                int rc2 = PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->svga.GCPhysFIFO);
+                int rc2 = PDMDevHlpPGMHandlerPhysicalReset(pDevIns, pThis->svga.GCPhysFIFO);
                 AssertRC(rc2); /* No break. Racing EMTs unmapping and remapping the region. */
 # endif
@@ -5196 +5196 @@
         if (RT_SUCCESS(rc))
         {
-            rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns), GCPhysAddress,
+            rc = PDMDevHlpPGMHandlerPhysicalRegister(pDevIns, GCPhysAddress,
 #  ifdef DEBUG_FIFO_ACCESS
-                                            GCPhysAddress + (pThis->svga.cbFIFO - 1),
+                                                     GCPhysAddress + (pThis->svga.cbFIFO - 1),
 #  else
-                                            GCPhysAddress + PAGE_SIZE - 1,
+                                                     GCPhysAddress + PAGE_SIZE - 1,
 #  endif
-                                            pThis->svga.hFifoAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR,
-                                            "VMSVGA FIFO");
+                                                     pThis->svga.hFifoAccessHandlerType, pThis, NIL_RTR0PTR, NIL_RTRCPTR,
+                                                     "VMSVGA FIFO");
             AssertRC(rc);
         }
@@ -5218 +5218 @@
         Assert(pThis->svga.GCPhysFIFO);
 # if defined(VMSVGA_USE_FIFO_ACCESS_HANDLER) || defined(DEBUG_FIFO_ACCESS)
-        rc = PGMHandlerPhysicalDeregister(PDMDevHlpGetVM(pDevIns), pThis->svga.GCPhysFIFO);
+        rc = PDMDevHlpPGMHandlerPhysicalDeregister(pDevIns, pThis->svga.GCPhysFIFO);
         AssertRC(rc);
 # else

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -3626 +3626 @@
 static VBOXSTRICTRC vgaLFBAccess(PVMCC pVM, PPDMDEVINS pDevIns, PVGASTATE pThis, RTGCPHYS GCPhys, RTGCPTR GCPtr)
 {
+    RT_NOREF(pVM);
+
     VBOXSTRICTRC rc = PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VINF_EM_RAW_EMULATE_INSTR);
     if (rc == VINF_SUCCESS)
@@ -3640 +3642 @@
          * ASSUME: the guest always maps video memory RW.
          */
-        rc = PGMHandlerPhysicalPageTempOff(pVM, pThis->GCPhysVRAM, GCPhys);
+        rc = PDMDevHlpPGMHandlerPhysicalPageTempOff(pDevIns, pThis->GCPhysVRAM, GCPhys);
         if (RT_SUCCESS(rc))
         {
@@ -4785 +4787 @@
     if (pThis->fHasDirtyBits && pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS)
     {
-        PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
+        PDMDevHlpPGMHandlerPhysicalReset(pDevIns, pThis->GCPhysVRAM);
         pThis->fHasDirtyBits = false;
     }
@@ -4814 +4816 @@
         /* The dirty bits array has been just cleared, reset handlers as well. */
         if (pThis->GCPhysVRAM && pThis->GCPhysVRAM != NIL_RTGCPHYS)
-            PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
+            PDMDevHlpPGMHandlerPhysicalReset(pDevIns, pThis->GCPhysVRAM);
     }
     if (pThis->fRemappedVGA)
@@ -5499 +5501 @@
 {
     Assert(pThis->GCPhysVRAM);
-    int rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns),
-                                        pThis->GCPhysVRAM, pThis->GCPhysVRAM + (cbFrameBuffer - 1),
-                                        pThis->hLfbAccessHandlerType, pDevIns, pDevIns->pDevInsR0RemoveMe,
-                                        pDevIns->pDevInsForRC, "VGA LFB");
+    int rc = PDMDevHlpPGMHandlerPhysicalRegister(pDevIns,
+                                                 pThis->GCPhysVRAM, pThis->GCPhysVRAM + (cbFrameBuffer - 1),
+                                                 pThis->hLfbAccessHandlerType, pDevIns, pDevIns->pDevInsR0RemoveMe,
+                                                 pDevIns->pDevInsForRC, "VGA LFB");
 
     AssertRC(rc);
@@ -5515 +5517 @@
 {
     Assert(pThis->GCPhysVRAM);
-    int rc = PGMHandlerPhysicalDeregister(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
+    int rc = PDMDevHlpPGMHandlerPhysicalDeregister(pDevIns, pThis->GCPhysVRAM);
     AssertRC(rc);
     return rc;
@@ -5569 +5571 @@
 # endif
             {
-                rc = PGMHandlerPhysicalRegister(PDMDevHlpGetVM(pDevIns), GCPhysAddress, GCPhysAddress + (pThis->vram_size - 1),
-                                                pThis->hLfbAccessHandlerType, pDevIns, pDevIns->pDevInsR0RemoveMe,
-                                                pDevIns->pDevInsForRC, "VGA LFB");
+                rc = PDMDevHlpPGMHandlerPhysicalRegister(pDevIns, GCPhysAddress, GCPhysAddress + (pThis->vram_size - 1),
+                                                         pThis->hLfbAccessHandlerType, pDevIns, pDevIns->pDevInsR0RemoveMe,
+                                                         pDevIns->pDevInsForRC, "VGA LFB");
                 AssertLogRelRC(rc);
             }
@@ -5596 +5598 @@
 # endif
         {
-            rc = PGMHandlerPhysicalDeregister(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
+            rc = PDMDevHlpPGMHandlerPhysicalDeregister(pDevIns, pThis->GCPhysVRAM);
             AssertRC(rc);
         }
@@ -6053 +6055 @@
         &&  pThis->GCPhysVRAM != NIL_RTGCPHYS)
     {
-        int rc = PGMHandlerPhysicalReset(PDMDevHlpGetVM(pDevIns), pThis->GCPhysVRAM);
+        int rc = PDMDevHlpPGMHandlerPhysicalReset(pDevIns, pThis->GCPhysVRAM);
         AssertRC(rc);
     }