Changeset 97815 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 15, 2022 7:39:35 PM (2 years ago)

Author:

vboxsync

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

154895

Message:

VMM: Don't assume a teleportation operation when VMR3LoadFromStream() is used because it might be used for fully encrypted VMs as well letting VMR3TeleportedAndNotFullyResumedYet() giving a wrong result

File:

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

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -1934 +1934 @@
  * @param   pfnProgress     Progress callback. Optional.
  * @param   pvProgressUser  User argument for the progress callback.
+ * @param   fTeleporting    Flag whether this call is part of a teleportation operation.
  *
  * @thread      Any thread.
@@ -1940 +1941 @@
  */
 VMMR3DECL(int) VMR3LoadFromStream(PUVM pUVM, PCSSMSTRMOPS pStreamOps, void *pvStreamOpsUser,
-                                  PFNVMPROGRESS pfnProgress, void *pvProgressUser)
-{
-    LogFlow(("VMR3LoadFromStream: pUVM=%p pStreamOps=%p pvStreamOpsUser=%p pfnProgress=%p pvProgressUser=%p\n",
-             pUVM, pStreamOps, pvStreamOpsUser, pfnProgress, pvProgressUser));
+                                  PFNVMPROGRESS pfnProgress, void *pvProgressUser, bool fTeleporting)
+{
+    LogFlow(("VMR3LoadFromStream: pUVM=%p pStreamOps=%p pvStreamOpsUser=%p pfnProgress=%p pvProgressUser=%p fTeleporting=%RTbool\n",
+             pUVM, pStreamOps, pvStreamOpsUser, pfnProgress, pvProgressUser, fTeleporting));
 
     /*
@@ -1957 +1958 @@
     int rc = VMR3ReqCallWaitU(pUVM, 0 /*idDstCpu*/, (PFNRT)vmR3Load, 7,
                               pUVM, (uintptr_t)NULL /*pszFilename*/, pStreamOps, pvStreamOpsUser, pfnProgress,
-                              pvProgressUser, true /*fTeleporting*/);
+                              pvProgressUser, fTeleporting);
     LogFlow(("VMR3LoadFromStream: returns %Rrc\n", rc));
     return rc;