External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 21:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virnetsocket: use new API for uniform child cleanup

Browse Source 
Rather than trying to clean up the ssh child ourselves, and risk
subtle differences from the socket creation error path, we can
just use the new APIs.

* src/rpc/virnetsocket.c (virNetSocketFree): Use new function.
This commit is contained in:
Eric Blake 2011-07-12 12:09:43 -06:00
parent 3cbf5d5f76
commit a59a99f218
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rpc/virnetsocket.c
View File

@ -652,18 +652,7 @@ void virNetSocketFree(virNetSocketPtr sock)
VIR_FORCE_CLOSE(sock->fd);
VIR_FORCE_CLOSE(sock->errfd);
#ifndef WIN32
if (sock->pid > 0) {
pid_t reap;
kill(sock->pid, SIGTERM);
do {
retry:
reap = waitpid(sock->pid, NULL, 0);
if (reap == -1 && errno == EINTR)
goto retry;
} while (reap != -1 && reap != sock->pid);
}
#endif
virPidAbort(sock->pid);
VIR_FREE(sock->localAddrStr);
VIR_FREE(sock->remoteAddrStr);