Changeset 23917 in vbox

Timestamp:

Oct 20, 2009 5:24:52 PM (15 years ago)

Author:

vboxsync

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

53722

Message:

VM: Set it VMINT::fTeleportedAndNotFullyResumedYet in VMR3Load....

File:

• trunk/src/VBox/VMM/VM.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/VM.cpp

@@ -1795 +1795 @@
  * @param   pfnProgress     Progress callback. Optional.
  * @param   pvUser          User argument for the progress callback.
+ * @param   fTeleporting    Indicates whether we're teleporting or not.
  *
  * @thread  EMT.
  */
 static DECLCALLBACK(int) vmR3Load(PVM pVM, const char *pszFilename, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
-                                  PFNVMPROGRESS pfnProgress, void *pvProgressUser)
-{
-    LogFlow(("vmR3Load: pVM=%p pszFilename=%p:{%s} pStreamOps=%p pvStreamOpsUser=%p pfnProgress=%p pvProgressUser=%p\n",
-             pVM, pszFilename, pszFilename, pStreamOps, pvStreamOpsUser, pfnProgress, pvProgressUser));
+                                  PFNVMPROGRESS pfnProgress, void *pvProgressUser, bool fTeleporting)
+{
+    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));
 
     /*
@@ -1823 +1824 @@
     if (RT_FAILURE(rc))
         return rc;
+    pVM->vm.s.fTeleportedAndNotFullyResumedYet = fTeleporting;
 
     rc = SSMR3Load(pVM, pszFilename, pStreamOps, pvStreamOpsUser, SSMAFTER_RESUME, pfnProgress, pvProgressUser);
@@ -1832 +1834 @@
     else
     {
+        pVM->vm.s.fTeleportedAndNotFullyResumedYet = false;
         vmR3SetState(pVM, VMSTATE_LOAD_FAILURE, VMSTATE_LOADING);
         rc = VMSetError(pVM, rc, RT_SRC_POS,
@@ -1874 +1877 @@
      * since there is no execution taking place when this call is allowed.
      */
-    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 6,
-                              pVM, pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOpsUser*/, pfnProgress, pvUser);
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 7,
+                              pVM, pszFilename, NULL /*pStreamOps*/, NULL /*pvStreamOpsUser*/, pfnProgress, pvUser,
+                              false /*fTeleporting*/);
     LogFlow(("VMR3LoadFromFile: returns %Rrc\n", rc));
     return rc;
@@ -1912 +1916 @@
      * since there is no execution taking place when this call is allowed.
      */
-    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 6,
-                              pVM, NULL /*pszFilename*/, pStreamOps, pvStreamOpsUser, pfnProgress, pvProgressUser);
+    int rc = VMR3ReqCallWaitU(pVM->pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 7,
+                              pVM, NULL /*pszFilename*/, pStreamOps, pvStreamOpsUser, pfnProgress, pvProgressUser,
+                              true /*fTeleporting*/);
     LogFlow(("VMR3LoadFromStream: returns %Rrc\n", rc));
     return rc;
@@ -3185 +3190 @@
  * Checks if the VM was teleported and hasn't been fully resumed yet.
  *
+ * This applies to both sides of the teleportation since we may leave a working
+ * clone behind and the user is allowed to resume this...
+ *
  * @returns true / false.
  * @param   pVM                 The VM handle.