diff options
author | Stefan Hajnoczi <stefanha@redhat.com> | 2013-04-04 16:18:28 +0200 |
---|---|---|
committer | Michael Roth <mdroth@linux.vnet.ibm.com> | 2013-04-04 15:17:32 -0500 |
commit | 68f9df599042482e54cd92193d3a8679c2b35bc7 (patch) | |
tree | 789472cdb53b601955e6b41891234de1dcaf575f /slirp | |
parent | 01357962718faee20d558dc5ee8ae248427af9e5 (diff) | |
download | qemu-68f9df599042482e54cd92193d3a8679c2b35bc7.tar.gz |
oslib-posix: rename socket_set_nonblock() to qemu_set_nonblock()
The fcntl(fd, F_SETFL, O_NONBLOCK) flag is not specific to sockets.
Rename to qemu_set_nonblock() just like qemu_set_cloexec().
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
(cherry picked from commit 399f1c8f8af1f6f8b18ef4e37169c6301264e467)
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Conflicts:
block/sheepdog.c
socket_set_block()/socket_set_nonblock() calls in different locations
include/qemu/sockets.h
socket_set_nodelay() does not exist in v1.4.0, messes up diff context
qemu-char.c
glib G_IO_IN events are not used in v1.4.0, messes up diff context
savevm.c
qemu_fopen_socket() only has read mode in v1.4.0, qemu_set_block() not
necessary.
slirp/misc.c
unportable setsockopt() calls in v1.4.0 mess up diff context
slirp/tcp_subr.c
file was reformatted, diff context is messed up
ui/vnc.c
old dcl->idle instead of vd->dcl.idle messes up diff context
Added:
migration-tcp.c, migration-unix.c
qemu_fopen_socket() write mode does not exist yet, qemu_set_block() call
is needed here.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Diffstat (limited to 'slirp')
-rw-r--r-- | slirp/misc.c | 2 | ||||
-rw-r--r-- | slirp/tcp_subr.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/slirp/misc.c b/slirp/misc.c index d4df972d13..00f0140852 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -215,7 +215,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty) setsockopt(so->s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(int)); opt = 1; setsockopt(so->s, SOL_SOCKET, SO_OOBINLINE, (char *)&opt, sizeof(int)); - socket_set_nonblock(so->s); + qemu_set_nonblock(so->s); /* Append the telnet options now */ if (so->so_m != NULL && do_pty == 1) { diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c index 1542e43619..8b7c2b5c44 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; - socket_set_nonblock(s); + qemu_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; } - socket_set_nonblock(s); + qemu_set_nonblock(s); opt = 1; setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)); opt = 1; |