Changeset 23668 in vbox for trunk/src

Timestamp:

Oct 10, 2009 3:01:18 AM (15 years ago)

Author:

vboxsync

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

53381

Message:

VMM: Live migration fixes.

Location:

trunk/src/VBox/VMM

Files:

• SSM.cpp (modified) (5 diffs)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/SSM.cpp

@@ -2066 +2066 @@
 
     if (pStrm->hIoThread != NIL_RTTHREAD)
-    {
         ASMAtomicWriteBool(&pStrm->fTerminating, true);
-        int rc2 = RTSemEventSignal(pStrm->fWrite ? pStrm->hEvtHead : pStrm->hEvtFree); AssertLogRelRC(rc2);
-        int rc3 = RTThreadWait(pStrm->hIoThread, RT_INDEFINITE_WAIT, NULL);            AssertLogRelRC(rc3);
+
+    int rc;
+    if (pStrm->fWrite)
+    {
+        int rc2 = RTSemEventSignal(pStrm->hEvtHead);                            AssertLogRelRC(rc2);
+        int rc3 = RTThreadWait(pStrm->hIoThread, RT_INDEFINITE_WAIT, NULL);     AssertLogRelRC(rc3);
         pStrm->hIoThread = NIL_RTTHREAD;
-    }
-
-    int rc = pStrm->pOps->pfnClose(pStrm->pvUser);
-    if (RT_FAILURE(rc))
-        ssmR3StrmSetError(pStrm, rc);
+
+        rc = pStrm->pOps->pfnClose(pStrm->pvUser);
+        if (RT_FAILURE(rc))
+            ssmR3StrmSetError(pStrm, rc);
+    }
+    else
+    {
+        rc = pStrm->pOps->pfnClose(pStrm->pvUser);
+        if (RT_FAILURE(rc))
+            ssmR3StrmSetError(pStrm, rc);
+
+        int rc2 = RTSemEventSignal(pStrm->hEvtFree);                            AssertLogRelRC(rc2);
+        int rc3 = RTThreadWait(pStrm->hIoThread, RT_INDEFINITE_WAIT, NULL);     AssertLogRelRC(rc3);
+        pStrm->hIoThread = NIL_RTTHREAD;
+    }
+
     pStrm->pOps   = NULL;
     pStrm->pvUser = NULL;
@@ -3612 +3626 @@
     VM_ASSERT_EMT0(pVM);
     AssertMsgReturn(   pSSM->enmAfter == SSMAFTER_DESTROY
-                    || pSSM->enmAfter == SSMAFTER_CONTINUE,
+                    || pSSM->enmAfter == SSMAFTER_CONTINUE
+                    || pSSM->enmAfter == SSMAFTER_MIGRATE,
                     ("%d\n", pSSM->enmAfter),
                     VERR_INVALID_PARAMETER);
@@ -4054 +4069 @@
     VM_ASSERT_EMT0(pVM);
     AssertMsgReturn(   pSSM->enmAfter == SSMAFTER_DESTROY
-                    || pSSM->enmAfter == SSMAFTER_CONTINUE,
+                    || pSSM->enmAfter == SSMAFTER_CONTINUE
+                    || pSSM->enmAfter == SSMAFTER_MIGRATE,
                     ("%d\n", pSSM->enmAfter),
                     VERR_INVALID_PARAMETER);
@@ -4444 +4460 @@
     VM_ASSERT_OTHER_THREAD(pVM);
     AssertMsgReturn(   pSSM->enmAfter == SSMAFTER_DESTROY
-                    || pSSM->enmAfter == SSMAFTER_CONTINUE,
+                    || pSSM->enmAfter == SSMAFTER_CONTINUE
+                    || pSSM->enmAfter == SSMAFTER_MIGRATE,
                     ("%d\n", pSSM->enmAfter),
                     VERR_INVALID_PARAMETER);
@@ -4644 +4661 @@
      */
     AssertMsgReturn(   enmAfter == SSMAFTER_DESTROY
-                    || enmAfter == SSMAFTER_CONTINUE,
+                    || enmAfter == SSMAFTER_CONTINUE
+                    || enmAfter == SSMAFTER_MIGRATE,
                     ("%d\n", enmAfter),
                     VERR_INVALID_PARAMETER);

trunk/src/VBox/VMM/VM.cpp

@@ -1587 +1587 @@
      * Validate input.
      */
-    AssertPtr(pszFilename);
+    AssertPtrNull(pszFilename);
+    AssertPtrNull(pStreamOps);
     AssertPtr(pVM);
-    Assert(enmAfter == SSMAFTER_DESTROY || enmAfter == SSMAFTER_CONTINUE);
+    Assert(   enmAfter == SSMAFTER_DESTROY
+           || enmAfter == SSMAFTER_CONTINUE
+           || enmAfter == SSMAFTER_MIGRATE);
     AssertPtr(ppSSM);
     *ppSSM = NULL;