Changeset 23540 in vbox

Timestamp:

Oct 4, 2009 9:00:21 PM (15 years ago)

Author:

vboxsync

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

53183

Message:

SSM: Added a live save flag to the file header and handle, exposing it via SSMR3HandleIsLiveSave. Also shut up an annoying progress bar assertion.

Location:

trunk

Files:

• include/VBox/ssm.h (modified) (1 diff)
• src/VBox/VMM/SSM.cpp (modified) (18 diffs)

trunk/include/VBox/ssm.h

@@ -658 +658 @@
 VMMR3DECL(int)          SSMR3HandleSetStatus(PSSMHANDLE pSSM, int iStatus);
 VMMR3DECL(SSMAFTER)     SSMR3HandleGetAfter(PSSMHANDLE pSSM);
-VMMR3DECL(uint64_t)     SSMR3HandleGetUnitOffset(PSSMHANDLE pSSM);
+VMMR3DECL(bool)         SSMR3HandleIsLiveSave(PSSMHANDLE pSSM);
 VMMR3_INT_DECL(int)     SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr);
 VMMR3DECL(int)          SSMR3Cancel(PVM pVM);

trunk/src/VBox/VMM/SSM.cpp

@@ -191 +191 @@
 /** The stream is checkesummed up to the footer using CRC-32. */
 #define SSMFILEHDR_FLAGS_STREAM_CRC32           RT_BIT_32(0)
+/** Indicates that the file was produced by a live save. */
+#define SSMFILEHDR_FLAGS_STREAM_LIVE_SAVE       RT_BIT_32(1)
 /** @} */
 
@@ -318 +320 @@
     } while (0)
 
+#define SSM_ASSERT_VALID_HANDLE(pSSM) \
+    do \
+    { \
+        AssertPtr(pSSM); \
+        Assert(pSSM->enmOp > SSMSTATE_INVALID && pSSM->enmOp < SSMSTATE_OPEN_END); \
+    } while (0)
+
 
 /*******************************************************************************
@@ -337 +346 @@
     SSMSTATE_LOAD_EXEC,
     SSMSTATE_LOAD_DONE,
-    SSMSTATE_OPEN_READ
+    SSMSTATE_OPEN_READ,
+    SSMSTATE_OPEN_END
 } SSMSTATE;
 
@@ -440 +450 @@
     /** The current uncompressed offset into the data unit. */
     uint64_t                offUnit;
+    /** Indicates that this is a live save or restore operation. */
+    bool                    fLiveSave;
 
     /** Pointer to the progress callback function. */
@@ -3805 +3817 @@
 
     /* (progress should be pending 99% now) */
-    AssertMsg(pSSM->uPercent == (101 - pSSM->uPercentDone), ("%d\n", pSSM->uPercent));
+    AssertMsg(   pSSM->uPercent == (101 - pSSM->uPercentDone)
+              || pSSM->fLiveSave, ("%d\n", pSSM->uPercent));
     return VINF_SUCCESS;
 }
@@ -3962 +3975 @@
     FileHdr.cUnits       = pVM->ssm.s.cUnits;
     FileHdr.fFlags       = SSMFILEHDR_FLAGS_STREAM_CRC32;
+    if (pSSM->fLiveSave)
+        FileHdr.fFlags  |= SSMFILEHDR_FLAGS_STREAM_LIVE_SAVE;
     FileHdr.cbMaxDecompr = RT_SIZEOFMEMB(SSMHANDLE, u.Read.abDataBuffer);
     FileHdr.u32CRC       = 0;
@@ -4009 +4024 @@
     pSSM->cbUnitLeftV1          = 0;
     pSSM->offUnit               = UINT64_MAX;
+    pSSM->fLiveSave             = false;
     pSSM->pfnProgress           = pfnProgress;
     pSSM->pvUser                = pvUser;
@@ -4377 +4393 @@
             }
         }
-#if 0
+#if 0 /** @todo check this out... */
         /*
          * Check the VM state to see if it has changed.
@@ -4515 +4531 @@
     pSSM->uPercentPrepare = 20; /** @todo fix these. */
     pSSM->uPercentDone    = 2;
+    pSSM->fLiveSave       = true;
 
     /*
@@ -4525 +4542 @@
     {
 /** @todo If it turns out we don't need to do ssmR3DoLivePrepRun on EMT0,
- *        simply move the code to SSMR3LiveDoStep1. */
+ *        simply move the code to SSMR3LiveDoStep1.
+ *  Update: This is certinaly the case, move it. */
         rc = ssmR3DoLivePrepRun(pVM, pSSM);
         if (RT_SUCCESS(rc))
@@ -6027 +6045 @@
  *
  * @returns VBox status.
- * @param   File                File to validate.
- *                              The file position is undefined on return.
+ * @param   pSSM                The saved state handle.  A number of field will
+ *                              be updated, mostly header related information.
+ *                              fLiveSave is also set if appropriate.
  * @param   fChecksumIt         Whether to checksum the file or not.  This will
  *                              be ignored if it the stream isn't a file.
@@ -6112 +6131 @@
                 return VERR_SSM_INTEGRITY;
             }
-            if ((uHdr.v2_0.fFlags & ~SSMFILEHDR_FLAGS_STREAM_CRC32))
+            if (uHdr.v2_0.fFlags & ~(SSMFILEHDR_FLAGS_STREAM_CRC32 | SSMFILEHDR_FLAGS_STREAM_LIVE_SAVE))
             {
                 LogRel(("SSM: Unknown header flags: %08x\n", uHdr.v2_0.fFlags));
@@ -6133 +6152 @@
             pSSM->u.Read.cbGCPhys       = uHdr.v2_0.cbGCPhys;
             pSSM->u.Read.cbGCPtr        = uHdr.v2_0.cbGCPtr;
-            pSSM->u.Read.fFixedGCPtrSize = true;
+            pSSM->u.Read.fFixedGCPtrSize= true;
             fChecksummed = !!(uHdr.v2_0.fFlags & SSMFILEHDR_FLAGS_STREAM_CRC32);
+            pSSM->fLiveSave             = !!(uHdr.v2_0.fFlags & SSMFILEHDR_FLAGS_STREAM_LIVE_SAVE);
         }
         else
@@ -6338 +6358 @@
     pSSM->cbUnitLeftV1      = 0;
     pSSM->offUnit           = UINT64_MAX;
+    pSSM->fLiveSave         = false;
     pSSM->pfnProgress       = NULL;
     pSSM->pvUser            = NULL;
@@ -7321 +7342 @@
 VMMR3DECL(int) SSMR3HandleGetStatus(PSSMHANDLE pSSM)
 {
+    SSM_ASSERT_VALID_HANDLE(pSSM);
     return pSSM->rc;
 }
@@ -7338 +7360 @@
 VMMR3DECL(int) SSMR3HandleSetStatus(PSSMHANDLE pSSM, int iStatus)
 {
+    SSM_ASSERT_VALID_HANDLE(pSSM);
     Assert(pSSM->enmOp != SSMSTATE_LIVE_VOTE);
     if (RT_FAILURE(iStatus))
@@ -7359 +7382 @@
 VMMR3DECL(SSMAFTER) SSMR3HandleGetAfter(PSSMHANDLE pSSM)
 {
+    SSM_ASSERT_VALID_HANDLE(pSSM);
     return pSSM->enmAfter;
 }
@@ -7364 +7388 @@
 
 /**
- * Get the current unit byte offset (uncompressed).
- *
- * @returns The offset. UINT64_MAX if called at a wrong time.
+ * Checks if it is a live save operation or not.
+ *
+ * @returns True if it is, false if it isn't.
  * @param   pSSM            SSM operation handle.
  */
-VMMR3DECL(uint64_t) SSMR3HandleGetUnitOffset(PSSMHANDLE pSSM)
-{
-    AssertMsgFailed(("/** @todo this isn't correct any longer. */"));
-    return pSSM->offUnit;
+VMMR3DECL(bool) SSMR3HandleIsLiveSave(PSSMHANDLE pSSM)
+{
+    SSM_ASSERT_VALID_HANDLE(pSSM);
+    return pSSM->fLiveSave;
 }