Changeset 94763 in vbox

Timestamp:

Apr 29, 2022 4:36:29 PM (3 years ago)

Author:

vboxsync

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

151148

Message:

VMM/SSM: Allow SSMR3Open and SSMR3ValidateFile to take a stream operations callback table, bugref:9955

Location:

trunk

Files:

• include/VBox/vmm/ssm.h (modified) (1 diff)
• src/VBox/Main/src-all/DisplayUtils.cpp (modified) (2 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/SSM.cpp (modified) (5 diffs)
• src/VBox/VMM/testcase/tstSSM-2.cpp (modified) (1 diff)
• src/VBox/VMM/testcase/tstSSM.cpp (modified) (3 diffs)

trunk/include/VBox/vmm/ssm.h

@@ -1212 +1212 @@
 VMMR3DECL(int)          SSMR3Load(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
                                   SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvProgressUser);
-VMMR3DECL(int)          SSMR3ValidateFile(const char *pszFilename, bool fChecksumIt);
-VMMR3DECL(int)          SSMR3Open(const char *pszFilename, unsigned fFlags, PSSMHANDLE *ppSSM);
+VMMR3DECL(int)          SSMR3ValidateFile(const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOps,
+                                          bool fChecksumIt);
+VMMR3DECL(int)          SSMR3Open(const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOps,
+                                  unsigned fFlags, PSSMHANDLE *ppSSM);
 VMMR3DECL(int)          SSMR3Close(PSSMHANDLE pSSM);
 VMMR3DECL(int)          SSMR3Seek(PSSMHANDLE pSSM, const char *pszUnit, uint32_t iInstance, uint32_t *piVersion);

trunk/src/VBox/Main/src-all/DisplayUtils.cpp

@@ -41 +41 @@
 
     PSSMHANDLE pSSM;
-    int vrc = SSMR3Open(strStateFilePath.c_str(), 0 /*fFlags*/, &pSSM);
+    int vrc = SSMR3Open(strStateFilePath.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
+                        0 /*fFlags*/, &pSSM);
     if (RT_SUCCESS(vrc))
     {
@@ -157 +158 @@
 
     PSSMHANDLE pSSM;
-    int vrc = SSMR3Open(strStateFilePath.c_str(), 0 /*fFlags*/, &pSSM);
+    int vrc = SSMR3Open(strStateFilePath.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
+                        0 /*fFlags*/, &pSSM);
     if (RT_SUCCESS(vrc))
     {

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -1616 +1616 @@
 
         PSSMHANDLE pSSM;
-        int vrc = pVMM->pfnSSMR3Open(strSavedStateFile.c_str(), 0, &pSSM);
+        int vrc = pVMM->pfnSSMR3Open(strSavedStateFile.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
+                                     0, &pSSM);
         if (RT_SUCCESS(vrc))
         {
@@ -7861 +7862 @@
 
             ComAssertRet(bstrSavedStateFile.isNotEmpty(), E_FAIL);
-            int vrc = pVMM->pfnSSMR3ValidateFile(strSavedStateFile.c_str(), false /* fChecksumIt */);
+            int vrc = pVMM->pfnSSMR3ValidateFile(strSavedStateFile.c_str(), NULL /*pStreamOps*/, NULL /*pvStreamOps*/,
+                                                 false /* fChecksumIt */);
             if (RT_FAILURE(vrc))
             {

trunk/src/VBox/VMM/VMMR3/SSM.cpp

@@ -9326 +9326 @@
  *
  * @param   pszFilename     The path to the file to validate.
+ * @param   pStreamOps      The stream method table. NULL if pszFilename is
+ *                          used.
+ * @param   pvStreamOps     The user argument to the stream methods.
  * @param   fChecksumIt     Whether to checksum the file or not.
  *
  * @thread  Any.
  */
-VMMR3DECL(int) SSMR3ValidateFile(const char *pszFilename, bool fChecksumIt)
+VMMR3DECL(int) SSMR3ValidateFile(const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOps, bool fChecksumIt)
 {
     LogFlow(("SSMR3ValidateFile: pszFilename=%p:{%s} fChecksumIt=%RTbool\n", pszFilename, pszFilename, fChecksumIt));
@@ -9338 +9341 @@
      */
     SSMHANDLE Handle;
-    int rc = ssmR3OpenFile(NULL, pszFilename, NULL /*pStreamOps*/, NULL /*pvUser*/, fChecksumIt,
+    int rc = ssmR3OpenFile(NULL, pszFilename, pStreamOps, pvStreamOps, fChecksumIt,
                            false /*fChecksumOnRead*/, 1 /*cBuffers*/, &Handle);
     if (RT_SUCCESS(rc))
@@ -9354 +9357 @@
  *
  * @param   pszFilename     The path to the saved state file.
+ * @param   pStreamOps      The stream method table. NULL if pszFilename is
+ *                          used.
+ * @param   pvStreamOps     The user argument to the stream methods.
  * @param   fFlags          Open flags. Reserved, must be 0.
  * @param   ppSSM           Where to store the SSM handle.
@@ -9359 +9365 @@
  * @thread  Any.
  */
-VMMR3DECL(int) SSMR3Open(const char *pszFilename, unsigned fFlags, PSSMHANDLE *ppSSM)
+VMMR3DECL(int) SSMR3Open(const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOps,
+                         unsigned fFlags, PSSMHANDLE *ppSSM)
 {
     LogFlow(("SSMR3Open: pszFilename=%p:{%s} fFlags=%#x ppSSM=%p\n", pszFilename, pszFilename, fFlags, ppSSM));
@@ -9379 +9386 @@
      * Try open the file and validate it.
      */
-    int rc = ssmR3OpenFile(NULL, pszFilename, NULL /*pStreamOps*/, NULL /*pvUser*/, false /*fChecksumIt*/,
+    int rc = ssmR3OpenFile(NULL, pszFilename, pStreamOps, pvStreamOps, false /*fChecksumIt*/,
                            true /*fChecksumOnRead*/, 1 /*cBuffers*/, pSSM);
     if (RT_SUCCESS(rc))

trunk/src/VBox/VMM/testcase/tstSSM-2.cpp

@@ -34 +34 @@
 {
     PSSMHANDLE pSSM;
-    int rc = SSMR3Open(pszFilename, 0, &pSSM);
+    int rc = SSMR3Open(pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOps*/, 0, &pSSM);
     RTEXITCODE rcExit = RTEXITCODE_FAILURE;
     if (RT_SUCCESS(rc))

trunk/src/VBox/VMM/testcase/tstSSM.cpp

@@ -806 +806 @@
      */
     u64Start = RTTimeNanoTS();
-    rc = SSMR3ValidateFile(pszFilename, false /* fChecksumIt*/ );
+    rc = SSMR3ValidateFile(pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOps*/, false /* fChecksumIt*/ );
     if (RT_FAILURE(rc))
     {
@@ -816 +816 @@
 
     u64Start = RTTimeNanoTS();
-    rc = SSMR3ValidateFile(pszFilename, true /* fChecksumIt */);
+    rc = SSMR3ValidateFile(pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOps*/, true /* fChecksumIt */);
     if (RT_FAILURE(rc))
     {
@@ -830 +830 @@
     u64Start = RTTimeNanoTS();
     PSSMHANDLE pSSM;
-    rc = SSMR3Open(pszFilename, 0, &pSSM);
+    rc = SSMR3Open(pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOps*/, 0, &pSSM);
     if (RT_FAILURE(rc))
     {