summaryrefslogtreecommitdiff
path: root/nbd.c
diff options
context:
space:
mode:
authorAmos Kong <akong@redhat.com>2012-05-11 00:28:16 +0800
committerAnthony Liguori <aliguori@us.ibm.com>2012-05-10 12:37:57 -0500
commita6ba35b3be9d3d2874cd00930c954347e6be764c (patch)
treea3649f8d62a340094d7c4fc14197c9742e061b52 /nbd.c
parentaed3d11df6d14ce63ac754601e4df965c608f6bd (diff)
downloadqemu-a6ba35b3be9d3d2874cd00930c954347e6be764c.tar.gz
qemu-a6ba35b3be9d3d2874cd00930c954347e6be764c.tar.bz2
qemu-a6ba35b3be9d3d2874cd00930c954347e6be764c.zip
sockets: change inet_connect() to support nonblock socket
Add a bool argument to inet_connect() to assign if set socket to block/nonblock, and delete original argument 'socktype' that is unused. Add a new argument to inet_connect()/inet_connect_opts(), to pass back connect error by error class. Retry to connect when -EINTR is got. Connect's successful for nonblock socket when following errors are got, user should wait for connecting by select(): -EINPROGRESS -EWOULDBLOCK (win32) -WSAEALREADY (win32) Change nbd, vnc to use new interface. Signed-off-by: Amos Kong <akong@redhat.com> Reviewed-by: Orit Wasserman <owasserm@redhat.com> Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'nbd.c')
-rw-r--r--nbd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nbd.c b/nbd.c
index 153709f628..bebfc49e2a 100644
--- a/nbd.c
+++ b/nbd.c
@@ -162,7 +162,7 @@ int tcp_socket_outgoing(const char *address, uint16_t port)
int tcp_socket_outgoing_spec(const char *address_and_port)
{
- return inet_connect(address_and_port, SOCK_STREAM);
+ return inet_connect(address_and_port, true, NULL);
}
int tcp_socket_incoming(const char *address, uint16_t port)