Changeset 32206 in vbox for trunk/src/VBox

Timestamp:

Sep 2, 2010 2:13:13 PM (14 years ago)

Author:

vboxsync

Message:

FT: no state changes for loading either

Location:

trunk/src/VBox/VMM

Files:

• FTM.cpp (modified) (1 diff)
• VM.cpp (modified) (5 diffs)
• include/internal/vm.h (modified) (1 diff)

trunk/src/VBox/VMM/FTM.cpp

@@ -946 +946 @@
 
             pVM->ftm.s.fDeltaLoadSaveActive = (fFullSync == false);
-            rc = VMR3LoadFromStream(pVM, &g_ftmR3TcpOps, pVM, NULL, NULL);
+            rc = VMR3LoadFromStreamFT(pVM, &g_ftmR3TcpOps, pVM);
             pVM->ftm.s.fDeltaLoadSaveActive = false;
             RTSocketRelease(pVM->ftm.s.hSocket);

trunk/src/VBox/VMM/VM.cpp

@@ -1932 +1932 @@
  * @returns VBox status code.
  *
- * @param   pVM             The VM handle.
- * @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   pfnProgress     Progress callback. Optional.
- * @param   pvUser          User argument for the progress callback.
- * @param   fTeleporting    Indicates whether we're teleporting or not.
+ * @param   pVM                 The VM handle.
+ * @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   pfnProgress         Progress callback. Optional.
+ * @param   pvUser              User argument for the progress callback.
+ * @param   fTeleporting        Indicates whether we're teleporting or not.
+ * @param   fSkipStateChanges   Set if we're supposed to skip state changes (FTM delta case)
  *
  * @thread  EMT.
  */
 static DECLCALLBACK(int) vmR3Load(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
-                                  PFNVMPROGRESS pfnProgress, void *pvProgressUser, bool fTeleporting)
-{
+                                  PFNVMPROGRESS pfnProgress, void *pvProgressUser, bool fTeleporting,
+                                  bool fSkipStateChanges)
+{
+    int rc = VINF_SUCCESS;
+
     LogFlow(("vmR3Load: pVM=%p pszFilename=%p:{%s} pStreamOps=%p pvStreamOpsUser=%p pfnProgress=%p pvProgressUser=%p fTeleporting=%RTbool\n",
              pVM, pszFilename, pszFilename, pStreamOps, pvStreamOpsUser, pfnProgress, pvProgressUser, fTeleporting));
@@ -1956 +1960 @@
     AssertPtrNull(pfnProgress);
 
-    /*
-     * Change the state and perform the load.
-     *
-     * Always perform a relocation round afterwards to make sure hypervisor
-     * selectors and such are correct.
-     */
-    int rc = vmR3TrySetState(pVM, "VMR3Load", 2,
-                             VMSTATE_LOADING, VMSTATE_CREATED,
-                             VMSTATE_LOADING, VMSTATE_SUSPENDED);
-    if (RT_FAILURE(rc))
-        return rc;
+    if (!fSkipStateChanges)
+    {
+        /*
+         * Change the state and perform the load.
+         *
+         * Always perform a relocation round afterwards to make sure hypervisor
+         * selectors and such are correct.
+         */
+        rc = vmR3TrySetState(pVM, "VMR3Load", 2,
+                                 VMSTATE_LOADING, VMSTATE_CREATED,
+                                 VMSTATE_LOADING, VMSTATE_SUSPENDED);
+        if (RT_FAILURE(rc))
+            return rc;
+    }
     pVM->vm.s.fTeleportedAndNotFullyResumedYet = fTeleporting;
 
@@ -1974 +1981 @@
     {
         VMR3Relocate(pVM, 0 /*offDelta*/);
-        vmR3SetState(pVM, VMSTATE_SUSPENDED, VMSTATE_LOADING);
+        if (!fSkipStateChanges)
+            vmR3SetState(pVM, VMSTATE_SUSPENDED, VMSTATE_LOADING);
     }
     else
     {
         pVM->vm.s.fTeleportedAndNotFullyResumedYet = false;
-        vmR3SetState(pVM, VMSTATE_LOAD_FAILURE, VMSTATE_LOADING);
+        if (!fSkipStateChanges)
+            vmR3SetState(pVM, VMSTATE_LOAD_FAILURE, VMSTATE_LOADING);
+
         if (cErrorsPriorToSave == VMR3GetErrorCount(pVM))
             rc = VMSetError(pVM, rc, RT_SRC_POS,
@@ -2024 +2034 @@
      * since there is no execution taking place when this call is allowed.
      */
-    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 7,
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 8,
                               pVM, pszFilename, (uintptr_t)NULL /*pStreamOps*/, (uintptr_t)NULL /*pvStreamOpsUser*/, pfnProgress, pvUser,
-                              false /*fTeleporting*/);
+                              false /*fTeleporting*/, false /* fSkipStateChanges */);
     LogFlow(("VMR3LoadFromFile: returns %Rrc\n", rc));
     return rc;
@@ -2063 +2073 @@
      * since there is no execution taking place when this call is allowed.
      */
-    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 7,
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 8,
                               pVM, (uintptr_t)NULL /*pszFilename*/, pStreamOps, pvStreamOpsUser, pfnProgress, pvProgressUser,
-                              true /*fTeleporting*/);
+                              true /*fTeleporting*/, false /* fSkipStateChanges */);
     LogFlow(("VMR3LoadFromStream: returns %Rrc\n", rc));
     return rc;
 }
 
+
+/**
+ * VMR3LoadFromFileFT for arbritrary file streams.
+ *
+ * @returns VBox status code.
+ *
+ * @param   pVM             The VM handle.
+ * @param   pStreamOps      The stream methods.
+ * @param   pvStreamOpsUser The user argument to the stream methods.
+ * @param   pfnProgress     Progress callback. Optional.
+ * @param   pvProgressUser  User argument for the progress callback.
+ *
+ * @thread      Any thread.
+ * @vmstate     Created, Suspended
+ * @vmstateto   Loading+Suspended
+ */
+VMMR3DECL(int) VMR3LoadFromStreamFT(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser)
+{
+    LogFlow(("VMR3LoadFromStreamFT: pVM=%p pStreamOps=%p pvStreamOpsUser=%p\n",
+             pVM, pStreamOps, pvStreamOpsUser));
+
+    /*
+     * Validate input.
+     */
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    AssertPtrReturn(pStreamOps, VERR_INVALID_POINTER);
+
+    /*
+     * Forward the request to EMT(0).  No need to setup a rendezvous here
+     * since there is no execution taking place when this call is allowed.
+     */
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 8,
+                              pVM, (uintptr_t)NULL /*pszFilename*/, pStreamOps, pvStreamOpsUser, NULL, NULL,
+                              true /*fTeleporting*/, true /* fSkipStateChanges */);
+    LogFlow(("VMR3LoadFromStream: returns %Rrc\n", rc));
+    return rc;
+}
 
 /**

trunk/src/VBox/VMM/include/internal/vm.h

@@ -22 +22 @@
 
 VMMR3DECL(int) VMR3SaveFT(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser, bool *pfSuspended, bool fSkipStateChanges);
+VMMR3DECL(int) VMR3LoadFromStreamFT(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser);
 
 #endif