diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-02 09:46:45 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-04-02 09:46:45 -0500 |
| commit | cefc898806e0346eef87d15ddaac9475b57b7d84 (patch) | |
| tree | ce4a6312d22ba96fe33fd4c5f1f2306807a07422 /slirp/tcp_subr.c | |
| parent | aba8e41e8666e4c0287cef1f6298985d4e03211d (diff) | |
| parent | 86073017e384b65a4b568da25e5873fd2e5e4db5 (diff) | |
| download | focaccia-qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.tar.gz focaccia-qemu-cefc898806e0346eef87d15ddaac9475b57b7d84.zip | |
Merge remote-tracking branch 'kiszka/queues/slirp' into staging
* kiszka/queues/slirp: slirp: Signal free input buffer space to io-thread w32/slirp: Undefine error constants before their redefinition slirp: use socket_set_nonblock slirp: clean up conflicts with system headers
Diffstat (limited to 'slirp/tcp_subr.c')
| -rw-r--r-- | slirp/tcp_subr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 6f6585a10f..0a545c41e7 100644 --- a/slirp/tcp_subr.c +++ b/slirp/tcp_subr.c @@ -336,7 +336,7 @@ int tcp_fconnect(struct socket *so) int opt, s=so->s; struct sockaddr_in addr; - fd_nonblock(s); + socket_set_nonblock(s); opt = 1; setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(opt )); opt = 1; @@ -424,7 +424,7 @@ tcp_connect(struct socket *inso) tcp_close(sototcpcb(so)); /* This will sofree() as well */ return; } - fd_nonblock(s); + socket_set_nonblock(s); opt = 1; setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)); opt = 1; |