Changeset 32090 in vbox for trunk/src/VBox/VMM

Timestamp:

Aug 30, 2010 12:40:26 PM (14 years ago)

Author:

vboxsync

Message:

FT cleanup

File:

• trunk/src/VBox/VMM/FTM.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/FTM.cpp

@@ -137 +137 @@
 {
     if (pVM->ftm.s.master.hShutdownEvent != NIL_RTSEMEVENT)
+    {
         RTSemEventDestroy(pVM->ftm.s.master.hShutdownEvent);
+        pVM->ftm.s.master.hShutdownEvent = NIL_RTSEMEVENT;
+    }
     if (pVM->ftm.s.hSocket != NIL_RTSOCKET)
+    {
         RTTcpClientClose(pVM->ftm.s.hSocket);
+        pVM->ftm.s.hSocket = NIL_RTSOCKET;
+    }
     if (pVM->ftm.s.standby.hServer)
+    {
         RTTcpServerDestroy(pVM->ftm.s.standby.hServer);
+        pVM->ftm.s.standby.hServer = NULL;
+    }
     if (pVM->ftm.s.pszAddress)
         RTMemFree(pVM->ftm.s.pszAddress);
     if (pVM->ftm.s.pszPassword)
         RTMemFree(pVM->ftm.s.pszPassword);
+
+    pVM->ftm.s.pszAddress  = NULL;
+    pVM->ftm.s.pszPassword = NULL;
 
     PDMR3CritSectDelete(&pVM->ftm.s.CritSect);
@@ -987 +999 @@
         /** @todo deal with the exit code to check if we should activate this standby VM. */
 
-        RTTcpServerDestroy(pVM->ftm.s.standby.hServer);
-        pVM->ftm.s.standby.hServer = NULL;
+        if (pVM->ftm.s.standby.hServer)
+        {
+            RTTcpServerDestroy(pVM->ftm.s.standby.hServer);
+            pVM->ftm.s.standby.hServer = NULL;
+        }
+        if (rc == VERR_TCP_SERVER_SHUTDOWN)
+            rc = VINF_SUCCESS;  /* ignore this error; the standby process was cancelled. */
     }
     return rc;