Changeset 81993 in vbox

Timestamp:

Nov 19, 2019 12:50:55 PM (5 years ago)

Author:

vboxsync

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

134792

Message:

DevACPI: Use devhlp for SSM. bugref:9218

File:

• trunk/src/VBox/Devices/PC/DevACPI.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/PC/DevACPI.cpp

@@ -2494 +2494 @@
 static DECLCALLBACK(int) acpiR3SaveState(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    PACPISTATE pThis = PDMDEVINS_2_DATA(pDevIns, PACPISTATE);
-    return SSMR3PutStruct(pSSM, pThis, &g_AcpiSavedStateFields8[0]);
+    PACPISTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PACPISTATE);
+    PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
+    return pHlp->pfnSSMPutStruct(pSSM, pThis, &g_AcpiSavedStateFields8[0]);
 }
 
@@ -2503 +2504 @@
 static DECLCALLBACK(int) acpiR3LoadState(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    PACPISTATE pThis = PDMDEVINS_2_DATA(pDevIns, PACPISTATE);
+    PACPISTATE      pThis = PDMDEVINS_2_DATA(pDevIns, PACPISTATE);
+    PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
@@ -2526 +2528 @@
     {
         case 4:
-            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields4[0]);
+            rc = pHlp->pfnSSMGetStruct(pSSM, pThis, &g_AcpiSavedStateFields4[0]);
             break;
         case 5:
-            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields5[0]);
+            rc = pHlp->pfnSSMGetStruct(pSSM, pThis, &g_AcpiSavedStateFields5[0]);
             break;
         case 6:
-            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields6[0]);
+            rc = pHlp->pfnSSMGetStruct(pSSM, pThis, &g_AcpiSavedStateFields6[0]);
             break;
         case 7:
-            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields7[0]);
+            rc = pHlp->pfnSSMGetStruct(pSSM, pThis, &g_AcpiSavedStateFields7[0]);
             break;
         case 8:
-            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields8[0]);
+            rc = pHlp->pfnSSMGetStruct(pSSM, pThis, &g_AcpiSavedStateFields8[0]);
             break;
         default: