From a6ba35b3be9d3d2874cd00930c954347e6be764c Mon Sep 17 00:00:00 2001 From: Amos Kong Date: Fri, 11 May 2012 00:28:16 +0800 Subject: 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 Reviewed-by: Orit Wasserman Reviewed-by: Michael Roth Signed-off-by: Anthony Liguori --- qemu_socket.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'qemu_socket.h') diff --git a/qemu_socket.h b/qemu_socket.h index a5d0a84..26998ef 100644 --- a/qemu_socket.h +++ b/qemu_socket.h @@ -27,6 +27,8 @@ int inet_aton(const char *cp, struct in_addr *ia); #endif /* !_WIN32 */ #include "qemu-option.h" +#include "error.h" +#include "qerror.h" /* misc helpers */ int qemu_socket(int domain, int type, int protocol); @@ -40,8 +42,8 @@ int send_all(int fd, const void *buf, int len1); int inet_listen_opts(QemuOpts *opts, int port_offset); int inet_listen(const char *str, char *ostr, int olen, int socktype, int port_offset); -int inet_connect_opts(QemuOpts *opts); -int inet_connect(const char *str, int socktype); +int inet_connect_opts(QemuOpts *opts, Error **errp); +int inet_connect(const char *str, bool block, Error **errp); int inet_dgram_opts(QemuOpts *opts); const char *inet_strfamily(int family); -- cgit v1.1