Changeset 93635 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 7, 2022 10:43:45 AM (3 years ago)

Author:

vboxsync

Message:

VMM/PGM,VMM/PDM,VGA: Consolidate the user parameters of the physical access handlers into a single uint64_t value that shouldn't be a pointer, at least not for ring-0 callbacks. Special hack for devices where it's translated from a ring-0 device instance index into a current context PPDMDEVINS (not really tested yet). bugref:10094

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA-cmd.cpp (modified) (5 diffs)
• DevVGA-SVGA-internal.h (modified) (1 diff)

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

@@ -358 +358 @@
  * @param   enmAccessType   The access type.
  * @param   enmOrigin       Who is making the access.
- * @param   pvUser          User argument.
+ * @param   pvUser          User argument - VMM sets this to the address of the
+ *                          device instance.
  */
 DECLCALLBACK(VBOXSTRICTRC)
 vmsvgaR3GboAccessHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
-                         PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser)
+                         PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, uint64_t uUser)
 {
     RT_NOREF(pVM, pVCpu, pvPhys, enmAccessType);
@@ -369 +370 @@
         return VINF_PGM_HANDLER_DO_DEFAULT;
 
-    PPDMDEVINS  pDevIns = (PPDMDEVINS)pvUser;
-    PVGASTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PVGASTATE);
-    PVGASTATECC pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVGASTATECC);
-    PVMSVGAR3STATE pSvgaR3State = pThisCC->svga.pSvgaR3State;
+    PPDMDEVINS      pDevIns = (PPDMDEVINS)uUser;
+    AssertPtrReturn(pDevIns, VERR_INTERNAL_ERROR_4);
+    AssertReturn(pDevIns->u32Version == PDM_DEVINSR3_VERSION, VERR_INTERNAL_ERROR_5);
+    PVGASTATE       pThis   = PDMDEVINS_2_DATA(pDevIns, PVGASTATE);
+    PVGASTATECC     pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PVGASTATECC);
+    PVMSVGAR3STATE  pSvgaR3State = pThisCC->svga.pSvgaR3State;
 
     /*
@@ -415 +418 @@
 }
 
-
 #ifdef VBOX_WITH_VMSVGA3D
+
 static int vmsvgaR3GboCreate(PVMSVGAR3STATE pSvgaR3State, SVGAMobFormat ptDepth, PPN64 baseAddress, uint32_t sizeInBytes, bool fGCPhys64, bool fWriteProtected, PVMSVGAGBO pGbo)
 {
@@ -592 +595 @@
         for (uint32_t i = 0; i < pGbo->cDescriptors; ++i)
         {
-            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");
+            rc = PDMDevHlpPGMHandlerPhysicalRegister(pSvgaR3State->pDevIns, pGbo->paDescriptors[i].GCPhys,
+                                                     pGbo->paDescriptors[i].GCPhys + pGbo->paDescriptors[i].cPages * PAGE_SIZE - 1,
+                                                     pSvgaR3State->hGboAccessHandlerType, "VMSVGA GBO");
             AssertRC(rc);
         }
@@ -1035 +1038 @@
     return rc;
 }
+
 #endif /* VBOX_WITH_VMSVGA3D */
-
 
 /*

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA-internal.h

@@ -248 +248 @@
 
 DECLCALLBACK(VBOXSTRICTRC) vmsvgaR3GboAccessHandler(PVM pVM, PVMCPU pVCpu, RTGCPHYS GCPhys, void *pvPhys, void *pvBuf, size_t cbBuf,
-                                                    PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, void *pvUser);
+                                                    PGMACCESSTYPE enmAccessType, PGMACCESSORIGIN enmOrigin, uint64_t uUser);
 
 void vmsvgaR3ResetScreens(PVGASTATE pThis, PVGASTATECC pThisCC);