Changeset 29954 in vbox for trunk/src

Timestamp:

Jun 1, 2010 3:06:02 PM (15 years ago)

Author:

vboxsync

Message:

SSM: The I/O thread must wake up the master thread when quitting on error or it'll get stuck when the connection breaks.

File:

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

trunk/src/VBox/VMM/SSM.cpp

@@ -2836 +2836 @@
             }
         }
+
+        if (!ASMAtomicReadBool(&pStrm->fTerminating))
+            RTSemEventSignal(pStrm->hEvtFree);
     }
     else
@@ -2863 +2866 @@
             }
         }
+
+        if (!ASMAtomicReadBool(&pStrm->fTerminating))
+            RTSemEventSignal(pStrm->hEvtHead);
     }
 
@@ -5416 +5422 @@
         return rc;
 
-    if (pSSM->enmAfter != SSMAFTER_DEBUG_IT)
-        AssertMsgFailed(("SSM: attempted reading more than the unit!\n"));
-    return VERR_SSM_LOADED_TOO_MUCH;
+    if (pSSM->enmAfter != SSMAFTER_DEBUG_IT && rc == VERR_EOF)
+        AssertMsgFailedReturn(("SSM: attempted reading more than the unit! rc=%Rrc\n", rc), VERR_SSM_LOADED_TOO_MUCH);
+    return VERR_SSM_STREAM_ERROR;
 }