Changeset 23595 in vbox for trunk/src/VBox

Timestamp:

Oct 7, 2009 1:49:38 PM (15 years ago)

Author:

vboxsync

Message:

SSM: SSMR3LiveToFile -> SSMR3LiveSave.

Location:

trunk/src/VBox/VMM

Files:

• SSM.cpp (modified) (13 diffs)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/SSM.cpp

@@ -63 +63 @@
  * The live saving sequence is something like this:
  *
- *      -# SSMR3LiveToFile is called on EMT0.  It returns a saved state
+ *      -# SSMR3LiveSave is called on EMT0.  It returns a saved state
  *         handle.
  *      -# SSMR3LiveDoStep1 is called on a non-EMT.  This will save the major
@@ -3592 +3592 @@
  * Closes the SSM handle.
  *
- * This must always be called on a handled returned by SSMR3LiveToFile or
- * SSMR3LiveToRemote.
+ * This must always be called on a handled returned by SSMR3LiveSave.
  *
  * @returns VBox status.
  *
- * @param   pSSM            The SSM handle returned by SSMR3LiveToFile or
- *                          SSMR3LiveToRemote.
+ * @param   pSSM            The SSM handle returned by SSMR3LiveSave.
  *
  * @thread  EMT(0).
@@ -4004 +4002 @@
 
 /**
- * Common worker for SSMR3Save and SSMR3Migrate.
+ * Common worker for SSMR3Save and SSMR3LiveSave.
  *
  * @returns VBox status code (no need to check pSSM->rc).
@@ -4040 +4038 @@
  * @returns VBox status.
  *
- * @param   pSSM            The SSM handle returned by SSMR3LiveToFile or
- *                          SSMR3LiveToRemote.
+ * @param   pSSM            The SSM handle returned by SSMR3LiveSave.
  *
  * @thread  Non-EMT thread. Will involve the EMT at the end of the operation.
@@ -4121 +4118 @@
  * @returns VBox status code.
  * @param   pVM                 The VM handle.
- * @param   pszFilename         The name of the file.
+ * @param   pszFilename         The name of the file.  NULL if pStreamOps is
+ *                              used.
+ * @param   pStreamOps          The stream methods.  NULL if pszFilename is
+ *                              used.
+ * @param   pvStreamOpsUser     The user argument to the stream methods.
  * @param   enmAfter            What to do afterwards.
  * @param   pfnProgress         The progress callback.
@@ -4129 +4130 @@
  *                              RTMemFree after closing the stream.
  */
-static int ssmR3SaveDoCreateFile(PVM pVM, const char *pszFilename, SSMAFTER enmAfter,
-                                 PFNVMPROGRESS pfnProgress, void *pvUser, PSSMHANDLE *ppSSM)
+static int ssmR3SaveDoCreateFile(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
+                                 SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvUser, PSSMHANDLE *ppSSM)
 {
     PSSMHANDLE pSSM = (PSSMHANDLE)RTMemAllocZ(sizeof(*pSSM));
@@ -4156 +4157 @@
     pSSM->u.Write.offDataBuffer = 0;
 
-    int rc = ssmR3StrmOpenFile(&pSSM->Strm, pszFilename, true /*fWrite*/, true /*fChecksummed*/, 8 /*cBuffers*/);
+    int rc;
+    if (pStreamOps)
+        rc = ssmR3StrmInit(&pSSM->Strm, pStreamOps, pvStreamOpsUser, true /*fWrite*/, true /*fChecksummed*/, 8 /*cBuffers*/);
+    else
+        rc = ssmR3StrmOpenFile(&pSSM->Strm, pszFilename,             true /*fWrite*/, true /*fChecksummed*/, 8 /*cBuffers*/);
     if (RT_FAILURE(rc))
     {
@@ -4202 +4207 @@
      */
     PSSMHANDLE pSSM;
-    int rc = ssmR3SaveDoCreateFile(pVM, pszFilename, enmAfter, pfnProgress, pvUser, &pSSM);
+    int rc = ssmR3SaveDoCreateFile(pVM, pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOpsUser*/,
+                                   enmAfter, pfnProgress, pvUser, &pSSM);
     if (RT_FAILURE(rc))
         return rc;
@@ -4422 +4428 @@
  * @returns VBox status.
  *
- * @param   pSSM            The SSM handle returned by SSMR3LiveToFile or
- *                          SSMR3LiveToRemote.
+ * @param   pSSM            The SSM handle returned by SSMR3LiveSave.
  *
  * @thread  Non-EMT thread. Will involve the EMT at the end of the operation.
@@ -4607 +4612 @@
 
 /**
- * Start saving the live state to a file.
+ * Start saving the live state.
  *
  * Call SSMR3LiveDoStep1, SSMR3LiveDoStep2 and finally SSMR3LiveDone on success.
@@ -4624 +4629 @@
  * @thread  EMT0
  */
-VMMR3_INT_DECL(int) SSMR3LiveToFile(PVM pVM, const char *pszFilename, SSMAFTER enmAfter,
-                                    PFNVMPROGRESS pfnProgress, void *pvUser, PSSMHANDLE *ppSSM)
-{
-    LogFlow(("SSMR3LiveToFile: pszFilename=%p:{%s} enmAfter=%d pfnProgress=%p pvUser=%p\n", pszFilename, pszFilename, enmAfter, pfnProgress, pvUser));
+VMMR3_INT_DECL(int) SSMR3LiveSave(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
+                                  SSMAFTER enmAfter, PFNVMPROGRESS pfnProgress, void *pvProgressUser, PSSMHANDLE *ppSSM)
+{
+    LogFlow(("SSMR3LiveSave: pszFilename=%p:{%s} pStreamOps=%p pvStreamOpsUser=%p enmAfter=%d pfnProgress=%p pvProgressUser=%p\n",
+             pszFilename, pszFilename, pStreamOps, pvStreamOpsUser, enmAfter, pfnProgress, pvProgressUser));
     VM_ASSERT_EMT0(pVM);
 
@@ -4637 +4643 @@
                     ("%d\n", enmAfter),
                     VERR_INVALID_PARAMETER);
+    AssertReturn(!pszFilename != !pStreamOps, VERR_INVALID_PARAMETER);
+    if (pStreamOps)
+    {
+        AssertReturn(pStreamOps->u32Version == SSMSTRMOPS_VERSION, VERR_INVALID_MAGIC);
+        AssertReturn(pStreamOps->u32EndVersion == SSMSTRMOPS_VERSION, VERR_INVALID_MAGIC);
+        AssertReturn(pStreamOps->pfnWrite, VERR_INVALID_PARAMETER);
+        AssertReturn(pStreamOps->pfnRead, VERR_INVALID_PARAMETER);
+        AssertReturn(pStreamOps->pfnSeek, VERR_INVALID_PARAMETER);
+        AssertReturn(pStreamOps->pfnTell, VERR_INVALID_PARAMETER);
+        AssertReturn(pStreamOps->pfnSize, VERR_INVALID_PARAMETER);
+        AssertReturn(pStreamOps->pfnClose, VERR_INVALID_PARAMETER);
+    }
 
     /*
@@ -4645 +4663 @@
      */
     PSSMHANDLE pSSM;
-    int rc = ssmR3SaveDoCreateFile(pVM, pszFilename, enmAfter, pfnProgress, pvUser, &pSSM);
+    int rc = ssmR3SaveDoCreateFile(pVM, pszFilename, pStreamOps, pvStreamOpsUser,
+                                   enmAfter, pfnProgress, pvProgressUser, &pSSM);
     if (RT_FAILURE(rc))
         return rc;

trunk/src/VBox/VMM/VM.cpp

@@ -1601 +1601 @@
     else if (rc == 2)
     {
-        rc = SSMR3LiveToFile(pVM, pszFilename, enmAfter, pfnProgress, pvUser, ppSSM);
+        rc = SSMR3LiveSave(pVM, pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOpsUser*/,
+                           enmAfter, pfnProgress, pvUser, ppSSM);
         /* (We're not subject to cancellation just yet.) */
     }