Changeset 32169 in vbox

Timestamp:

Sep 1, 2010 9:21:30 AM (14 years ago)

Author:

vboxsync

Message:

FT updates

Location:

trunk

Files:

• include/VBox/vmapi.h (modified) (1 diff)
• src/VBox/Frontends/VBoxBFE/VMControl.cpp (modified) (1 diff)
• src/VBox/Main/ConsoleImpl.cpp (modified) (2 diffs)
• src/VBox/VMM/FTM.cpp (modified) (4 diffs)
• src/VBox/VMM/VM.cpp (modified) (3 diffs)
• src/VBox/VMM/include/internal/vm.h (added)

trunk/include/VBox/vmapi.h

@@ -332 +332 @@
 typedef FNVMPROGRESS *PFNVMPROGRESS;
 
-VMMR3DECL(int)  VMR3Save(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser, bool fContinueAfterwards, PFNVMPROGRESS pfnProgress, void *pvUser, bool *pfSuspended);
+VMMR3DECL(int)  VMR3Save(PVM pVM, const char *pszFilename, bool fContinueAfterwards, PFNVMPROGRESS pfnProgress, void *pvUser, bool *pfSuspended);
 VMMR3DECL(int)  VMR3Teleport(PVM pVM, uint32_t cMsDowntime, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser, PFNVMPROGRESS pfnProgress, void *pvProgressUser, bool *pfSuspended);
 VMMR3DECL(int)  VMR3LoadFromFile(PVM pVM, const char *pszFilename, PFNVMPROGRESS pfnProgress, void *pvUser);

trunk/src/VBox/Frontends/VBoxBFE/VMControl.cpp

@@ -133 +133 @@
     rc = VMR3ReqCallWait(gpVM, VMCPUID_ANY,
                          (PFNRT)VMR3Save, 7, gpVM, g_pszStateFile, 
-                         NULL /* pStreamOps */,
-                         NULL /* pvStreamOpsUser */,
                          false /*fContinueAftewards*/, &callProgressInfo, (uintptr_t)NULL);
     AssertRC(rc);

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -7811 +7811 @@
             int vrc = VMR3Save(that->mpVM,
                                strSavedStateFile.c_str(),
-                               NULL /* pStreamOps */,
-                               NULL /* pvStreamOpsUser */,
                                true /*fContinueAfterwards*/,
                                Console::stateProgressCallback,
@@ -8072 +8070 @@
     int vrc = VMR3Save(that->mpVM,
                        task->mSavedStateFile.c_str(),
-                        NULL /* pStreamOps */,
-                        NULL /* pvStreamOpsUser */,
                        false, /*fContinueAfterwards*/
                        Console::stateProgressCallback,

trunk/src/VBox/VMM/FTM.cpp

@@ -38 +38 @@
 #include <iprt/semaphore.h>
 #include <iprt/asm.h>
+
+#include <include/internal/vm.h>
 
 /*******************************************************************************
@@ -613 +615 @@
         rc = VMR3Suspend(pVM);
         AssertRCReturn(rc, rc);
+        /** Hack alert as EM is responsible for dealing with the suspend state. We must do this here ourselves, but only for this EMT.*/
+        if (VM_IS_EMT(pVM))
+            TMR3NotifySuspend(pVM, VMMGetCpu(pVM));  /* Stop the virtual time. */
     }
 
@@ -639 +644 @@
 
         pVM->ftm.s.fDeltaLoadSaveActive = (fFullSync == false);
-        rc = VMR3Save(pVM, NULL /* pszFilename */, &g_ftmR3TcpOps, pVM, true /* fContinueAfterwards */, NULL, NULL, &fSuspended);
+        rc = VMR3SaveFT(pVM, &g_ftmR3TcpOps, pVM, &fSuspended);
         pVM->ftm.s.fDeltaLoadSaveActive = false;
         AssertRC(rc);
@@ -664 +669 @@
         rc = VMR3Resume(pVM);
         AssertRCReturn(rc, rc);
+
+        /** Hack alert as EM is responsible for dealing with the suspend state. We must do this here ourselves, but only for this EMT.*/
+        if (VM_IS_EMT(pVM))
+            TMR3NotifyResume(pVM, VMMGetCpu(pVM));  /* Stop the virtual time. */
     }
     return VINF_SUCCESS;

trunk/src/VBox/VMM/VM.cpp

@@ -1761 +1761 @@
  *              RunningLS+SuspeningLS+SuspendedLS+Saving+Suspended.
  */
-VMMR3DECL(int) VMR3Save(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
-                        bool fContinueAfterwards, PFNVMPROGRESS pfnProgress, void *pvUser, bool *pfSuspended)
+VMMR3DECL(int) VMR3Save(PVM pVM, const char *pszFilename, bool fContinueAfterwards, PFNVMPROGRESS pfnProgress, void *pvUser, bool *pfSuspended)
 {
     LogFlow(("VMR3Save: pVM=%p pszFilename=%p:{%s} fContinueAfterwards=%RTbool pfnProgress=%p pvUser=%p pfSuspended=%p\n",
@@ -1774 +1773 @@
     VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
     VM_ASSERT_OTHER_THREAD(pVM);
-    AssertReturn(VALID_PTR(pszFilename) || pStreamOps, VERR_INVALID_POINTER);
-    AssertReturn(pStreamOps || *pszFilename, VERR_INVALID_PARAMETER);
+    AssertReturn(VALID_PTR(pszFilename), VERR_INVALID_POINTER);
+    AssertReturn(*pszFilename, VERR_INVALID_PARAMETER);
     AssertPtrNullReturn(pfnProgress, VERR_INVALID_POINTER);
 
@@ -1783 +1782 @@
     SSMAFTER enmAfter = fContinueAfterwards ? SSMAFTER_CONTINUE : SSMAFTER_DESTROY;
     int rc = vmR3SaveTeleport(pVM, 250 /*cMsMaxDowntime*/,
-                              pszFilename, pStreamOps, pvStreamOpsUser,
+                              pszFilename, NULL /* pStreamOps */, NULL /* pvStreamOpsUser */,
                               enmAfter, pfnProgress, pvUser, pfSuspended);
+    LogFlow(("VMR3Save: returns %Rrc (*pfSuspended=%RTbool)\n", rc, *pfSuspended));
+    return rc;
+}
+
+/**
+ * Save current VM state (used by FTM)
+ *
+ * Can be used for both saving the state and creating snapshots.
+ *
+ * When called for a VM in the Running state, the saved state is created live
+ * and the VM is only suspended when the final part of the saving is preformed.
+ * The VM state will not be restored to Running in this case and it's up to the
+ * caller to call VMR3Resume if this is desirable.  (The rational is that the
+ * caller probably wish to reconfigure the disks before resuming the VM.)
+ *
+ * @returns VBox status code.
+ *
+ * @param   pVM                 The VM which state should be saved.
+ * @param   pStreamOps          The stream methods.
+ * @param   pvStreamOpsUser     The user argument to the stream methods.
+ * @param   pfSuspended         Set if we suspended the VM.
+ *
+ * @thread      Any
+ * @vmstate     Suspended or Running
+ * @vmstateto   Saving+Suspended or
+ *              RunningLS+SuspeningLS+SuspendedLS+Saving+Suspended.
+ */
+VMMR3DECL(int) VMR3SaveFT(PVM pVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser, bool *pfSuspended)
+{
+    LogFlow(("VMR3SaveFT: pVM=%p pStreamOps=%p pvSteamOpsUser=%p pfSuspended=%p\n",
+             pVM, pStreamOps, pvStreamOpsUser, pfSuspended));
+
+    /*
+     * Validate input.
+     */
+    AssertPtr(pfSuspended);
+    *pfSuspended = false;
+    VM_ASSERT_VALID_EXT_RETURN(pVM, VERR_INVALID_VM_HANDLE);
+    AssertReturn(pStreamOps, VERR_INVALID_PARAMETER);
+
+    /*
+     * Join paths with VMR3Teleport.
+     */
+    int rc = vmR3SaveTeleport(pVM, 250 /*cMsMaxDowntime*/,
+                              NULL, pStreamOps, pvStreamOpsUser,
+                              SSMAFTER_CONTINUE, NULL, NULL, pfSuspended);
     LogFlow(("VMR3Save: returns %Rrc (*pfSuspended=%RTbool)\n", rc, *pfSuspended));
     return rc;