Changeset 82047 in vbox

Timestamp:

Nov 20, 2019 7:58:23 PM (5 years ago)

Author:

vboxsync

Message:

DevVGA: SSMR3 -> pHlp->pfnSSM. bugref:9218

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (20 diffs)

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

@@ -545 +545 @@
 
 static void vmsvgaSetTraces(PVGASTATE pThis, bool fTraces);
-static int vmsvgaLoadExecFifo(PVGASTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
-static int vmsvgaSaveExecFifo(PVGASTATE pThis, PSSMHANDLE pSSM);
+static int vmsvgaLoadExecFifo(PCPDMDEVHLPR3 pHlp, PVGASTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass);
+static int vmsvgaSaveExecFifo(PCPDMDEVHLPR3 pHlp, PVGASTATE pThis, PSSMHANDLE pSSM);
 
 VMSVGASCREENOBJECT *vmsvgaGetScreenObject(PVGASTATE pThis, uint32_t idScreen)
@@ -2948 +2948 @@
             PSSMHANDLE pSSM = (PSSMHANDLE)pThis->svga.pvFIFOExtCmdParam;
             AssertLogRelMsgBreak(RT_VALID_PTR(pSSM), ("pSSM=%p\n", pSSM));
-            vmsvgaSaveExecFifo(pThis, pSSM);
+            vmsvgaSaveExecFifo(pThis->pDevInsR3->pHlpR3, pThis, pSSM);
 # ifdef VBOX_WITH_VMSVGA3D
             if (pThis->svga.f3DEnabled)
@@ -2961 +2961 @@
             PVMSVGA_STATE_LOAD pLoadState = (PVMSVGA_STATE_LOAD)pThis->svga.pvFIFOExtCmdParam;
             AssertLogRelMsgBreak(RT_VALID_PTR(pLoadState), ("pLoadState=%p\n", pLoadState));
-            vmsvgaLoadExecFifo(pThis, pLoadState->pSSM, pLoadState->uVersion, pLoadState->uPass);
+            vmsvgaLoadExecFifo(pThis->pDevInsR3->pHlpR3, pThis, pLoadState->pSSM, pLoadState->uVersion, pLoadState->uPass);
 # ifdef VBOX_WITH_VMSVGA3D
             if (pThis->svga.f3DEnabled)
@@ -5522 +5522 @@
 /** Portion of VMSVGA state which must be loaded oin the FIFO thread.
  */
-static int vmsvgaLoadExecFifo(PVGASTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
+static int vmsvgaLoadExecFifo(PCPDMDEVHLPR3 pHlp, PVGASTATE pThis, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
     RT_NOREF(uPass);
@@ -5532 +5532 @@
     {
         uint32_t cScreens = 0;
-        rc = SSMR3GetU32(pSSM, &cScreens);
+        rc = pHlp->pfnSSMGetU32(pSSM, &cScreens);
         AssertRCReturn(rc, rc);
         AssertLogRelMsgReturn(cScreens <= _64K, /* big enough */
@@ -5543 +5543 @@
             RT_ZERO(screen);
 
-            rc = SSMR3GetStructEx(pSSM, &screen, sizeof(screen), 0, g_aVMSVGASCREENOBJECTFields, NULL);
+            rc = pHlp->pfnSSMGetStructEx(pSSM, &screen, sizeof(screen), 0, g_aVMSVGASCREENOBJECTFields, NULL);
             AssertLogRelRCReturn(rc, rc);
 
@@ -5584 +5584 @@
 {
     RT_NOREF(uPass);
-    PVGASTATE       pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+    PVGASTATE       pThis      = PDMINS_2_DATA(pDevIns, PVGASTATE);
     PVMSVGAR3STATE  pSVGAState = pThis->svga.pSvgaR3State;
+    PCPDMDEVHLPR3   pHlp       = pDevIns->pHlpR3;
     int             rc;
 
     /* Load our part of the VGAState */
-    rc = SSMR3GetStructEx(pSSM, &pThis->svga, sizeof(pThis->svga), 0, g_aVGAStateSVGAFields, NULL);
+    rc = pHlp->pfnSSMGetStructEx(pSSM, &pThis->svga, sizeof(pThis->svga), 0, g_aVGAStateSVGAFields, NULL);
     AssertRCReturn(rc, rc);
 
@@ -5597 +5598 @@
     if (uVersion >= VGA_SAVEDSTATE_VERSION_VMSVGA_VGA_FB_FIX)
     {
-        rc = SSMR3GetU32(pSSM, &cbVgaFramebuffer);
+        rc = pHlp->pfnSSMGetU32(pSSM, &cbVgaFramebuffer);
         AssertRCReturn(rc, rc);
         AssertLogRelMsgReturn(cbVgaFramebuffer <= _4M && cbVgaFramebuffer >= _32K && RT_IS_POWER_OF_TWO(cbVgaFramebuffer),
@@ -5605 +5606 @@
         AssertCompile(RT_IS_POWER_OF_TWO(VMSVGA_VGA_FB_BACKUP_SIZE));
     }
-    rc = SSMR3GetMem(pSSM, pThis->svga.pbVgaFrameBufferR3, RT_MIN(cbVgaFramebuffer, VMSVGA_VGA_FB_BACKUP_SIZE));
+    rc = pHlp->pfnSSMGetMem(pSSM, pThis->svga.pbVgaFrameBufferR3, RT_MIN(cbVgaFramebuffer, VMSVGA_VGA_FB_BACKUP_SIZE));
     AssertRCReturn(rc, rc);
     if (cbVgaFramebuffer > VMSVGA_VGA_FB_BACKUP_SIZE)
-        SSMR3Skip(pSSM, cbVgaFramebuffer - VMSVGA_VGA_FB_BACKUP_SIZE);
+        pHlp->pfnSSMSkip(pSSM, cbVgaFramebuffer - VMSVGA_VGA_FB_BACKUP_SIZE);
     else if (cbVgaFramebuffer < VMSVGA_VGA_FB_BACKUP_SIZE)
         RT_BZERO(&pThis->svga.pbVgaFrameBufferR3[cbVgaFramebuffer], VMSVGA_VGA_FB_BACKUP_SIZE - cbVgaFramebuffer);
 
     /* Load the VMSVGA state. */
-    rc = SSMR3GetStructEx(pSSM, pSVGAState, sizeof(*pSVGAState), 0, g_aVMSVGAR3STATEFields, NULL);
+    rc = pHlp->pfnSSMGetStructEx(pSSM, pSVGAState, sizeof(*pSVGAState), 0, g_aVMSVGAR3STATEFields, NULL);
     AssertRCReturn(rc, rc);
 
@@ -5622 +5623 @@
         AssertReturn(pSVGAState->Cursor.pData, VERR_NO_MEMORY);
 
-        rc = SSMR3GetMem(pSSM, pSVGAState->Cursor.pData, pSVGAState->Cursor.cbData);
+        rc = pHlp->pfnSSMGetMem(pSSM, pSVGAState->Cursor.pData, pSVGAState->Cursor.cbData);
         AssertRCReturn(rc, rc);
     }
@@ -5630 +5631 @@
     if (uVersion >= VGA_SAVEDSTATE_VERSION_VMSVGA_GMR_COUNT)
     {
-        rc = SSMR3GetU32(pSSM, &cGMR);
+        rc = pHlp->pfnSSMGetU32(pSSM, &cGMR);
         AssertRCReturn(rc, rc);
         /* Numbers of GMRs was never less than 256. 1MB is a large arbitrary limit. */
@@ -5652 +5653 @@
         PGMR pGMR = &pSVGAState->paGMR[i];
 
-        rc = SSMR3GetStructEx(pSSM, pGMR, sizeof(*pGMR), 0, g_aGMRFields, NULL);
+        rc = pHlp->pfnSSMGetStructEx(pSSM, pGMR, sizeof(*pGMR), 0, g_aGMRFields, NULL);
         AssertRCReturn(rc, rc);
 
@@ -5663 +5664 @@
             for (uint32_t j = 0; j < pGMR->numDescriptors; ++j)
             {
-                rc = SSMR3GetStructEx(pSSM, &pGMR->paDesc[j], sizeof(pGMR->paDesc[j]), 0, g_aVMSVGAGMRDESCRIPTORFields, NULL);
+                rc = pHlp->pfnSSMGetStructEx(pSSM, &pGMR->paDesc[j], sizeof(pGMR->paDesc[j]), 0, g_aVMSVGAGMRDESCRIPTORFields, NULL);
                 AssertRCReturn(rc, rc);
             }
@@ -5688 +5689 @@
 int vmsvgaLoadDone(PPDMDEVINS pDevIns)
 {
-    PVGASTATE       pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+    PVGASTATE       pThis      = PDMINS_2_DATA(pDevIns, PVGASTATE);
     PVMSVGAR3STATE  pSVGAState = pThis->svga.pSvgaR3State;
 
@@ -5714 +5715 @@
  * Portion of SVGA state which must be saved in the FIFO thread.
  */
-static int vmsvgaSaveExecFifo(PVGASTATE pThis, PSSMHANDLE pSSM)
+static int vmsvgaSaveExecFifo(PCPDMDEVHLPR3 pHlp, PVGASTATE pThis, PSSMHANDLE pSSM)
 {
     PVMSVGAR3STATE  pSVGAState = pThis->svga.pSvgaR3State;
@@ -5728 +5729 @@
     }
 
-    rc = SSMR3PutU32(pSSM, cScreens);
+    rc = pHlp->pfnSSMPutU32(pSSM, cScreens);
     AssertLogRelRCReturn(rc, rc);
 
@@ -5735 +5736 @@
         VMSVGASCREENOBJECT *pScreen = &pSVGAState->aScreens[i];
 
-        rc = SSMR3PutStructEx(pSSM, pScreen, sizeof(*pScreen), 0, g_aVMSVGASCREENOBJECTFields, NULL);
+        rc = pHlp->pfnSSMPutStructEx(pSSM, pScreen, sizeof(*pScreen), 0, g_aVMSVGASCREENOBJECTFields, NULL);
         AssertLogRelRCReturn(rc, rc);
     }
@@ -5746 +5747 @@
 int vmsvgaSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PVGASTATE       pThis = PDMINS_2_DATA(pDevIns, PVGASTATE);
+    PVGASTATE       pThis      = PDMINS_2_DATA(pDevIns, PVGASTATE);
     PVMSVGAR3STATE  pSVGAState = pThis->svga.pSvgaR3State;
+    PCPDMDEVHLPR3   pHlp       = pDevIns->pHlpR3;
     int             rc;
 
     /* Save our part of the VGAState */
-    rc = SSMR3PutStructEx(pSSM, &pThis->svga, sizeof(pThis->svga), 0, g_aVGAStateSVGAFields, NULL);
+    rc = pHlp->pfnSSMPutStructEx(pSSM, &pThis->svga, sizeof(pThis->svga), 0, g_aVGAStateSVGAFields, NULL);
     AssertLogRelRCReturn(rc, rc);
 
     /* Save the framebuffer backup. */
-    rc = SSMR3PutU32(pSSM, VMSVGA_VGA_FB_BACKUP_SIZE);
-    rc = SSMR3PutMem(pSSM, pThis->svga.pbVgaFrameBufferR3, VMSVGA_VGA_FB_BACKUP_SIZE);
+    rc = pHlp->pfnSSMPutU32(pSSM, VMSVGA_VGA_FB_BACKUP_SIZE);
+    rc = pHlp->pfnSSMPutMem(pSSM, pThis->svga.pbVgaFrameBufferR3, VMSVGA_VGA_FB_BACKUP_SIZE);
     AssertLogRelRCReturn(rc, rc);
 
     /* Save the VMSVGA state. */
-    rc = SSMR3PutStructEx(pSSM, pSVGAState, sizeof(*pSVGAState), 0, g_aVMSVGAR3STATEFields, NULL);
+    rc = pHlp->pfnSSMPutStructEx(pSSM, pSVGAState, sizeof(*pSVGAState), 0, g_aVMSVGAR3STATEFields, NULL);
     AssertLogRelRCReturn(rc, rc);
 
@@ -5766 +5768 @@
     if (pSVGAState->Cursor.fActive)
     {
-        rc = SSMR3PutMem(pSSM, pSVGAState->Cursor.pData, pSVGAState->Cursor.cbData);
+        rc = pHlp->pfnSSMPutMem(pSSM, pSVGAState->Cursor.pData, pSVGAState->Cursor.cbData);
         AssertLogRelRCReturn(rc, rc);
     }
 
     /* Save the GMR state */
-    rc = SSMR3PutU32(pSSM, pThis->svga.cGMR);
+    rc = pHlp->pfnSSMPutU32(pSSM, pThis->svga.cGMR);
     AssertLogRelRCReturn(rc, rc);
     for (uint32_t i = 0; i < pThis->svga.cGMR; ++i)
@@ -5777 +5779 @@
         PGMR pGMR = &pSVGAState->paGMR[i];
 
-        rc = SSMR3PutStructEx(pSSM, pGMR, sizeof(*pGMR), 0, g_aGMRFields, NULL);
+        rc = pHlp->pfnSSMPutStructEx(pSSM, pGMR, sizeof(*pGMR), 0, g_aGMRFields, NULL);
         AssertLogRelRCReturn(rc, rc);
 
         for (uint32_t j = 0; j < pGMR->numDescriptors; ++j)
         {
-            rc = SSMR3PutStructEx(pSSM, &pGMR->paDesc[j], sizeof(pGMR->paDesc[j]), 0, g_aVMSVGAGMRDESCRIPTORFields, NULL);
+            rc = pHlp->pfnSSMPutStructEx(pSSM, &pGMR->paDesc[j], sizeof(pGMR->paDesc[j]), 0, g_aVMSVGAGMRDESCRIPTORFields, NULL);
             AssertLogRelRCReturn(rc, rc);
         }