diff options
author | Cao jin <caoj.fnst@cn.fujitsu.com> | 2016-07-21 18:33:32 +0800 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-08-02 12:03:58 +0200 |
commit | 00432b69538559285ca55677c1002cad556aea50 (patch) | |
tree | d650d998c3896636a3679bd6fee81bc1d6168dac | |
parent | 3f822cff4473fd6313f6c06623edf148b3ad2cc6 (diff) |
util: drop inet_nonblocking_connect()
It is never used; all nonblocking connect now goes through
socket_connect(), which calls inet_connect_addr().
Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Message-Id: <1469097213-26441-2-git-send-email-caoj.fnst@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | include/qemu/sockets.h | 3 | ||||
-rw-r--r-- | util/qemu-sockets.c | 30 |
2 files changed, 0 insertions, 33 deletions
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 5fe01fbc6c..2cbe6432cd 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -36,9 +36,6 @@ InetSocketAddress *inet_parse(const char *str, Error **errp); int inet_listen(const char *str, char *ostr, int olen, int socktype, int port_offset, Error **errp); int inet_connect(const char *str, Error **errp); -int inet_nonblocking_connect(const char *str, - NonBlockingConnectHandler *callback, - void *opaque, Error **errp); NetworkAddressFamily inet_netfamily(int family); diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 777af49d53..2e0570b2b7 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -674,36 +674,6 @@ int inet_connect(const char *str, Error **errp) return sock; } -/** - * Create a non-blocking socket and connect it to an address. - * Calls the callback function with fd in case of success or -1 in case of - * error. - * - * @str: address string - * @callback: callback function that is called when connect completes, - * cannot be NULL. - * @opaque: opaque for callback function - * @errp: set in case of an error - * - * Returns: -1 on immediate error, file descriptor on success. - **/ -int inet_nonblocking_connect(const char *str, - NonBlockingConnectHandler *callback, - void *opaque, Error **errp) -{ - int sock = -1; - InetSocketAddress *addr; - - g_assert(callback != NULL); - - addr = inet_parse(str, errp); - if (addr != NULL) { - sock = inet_connect_saddr(addr, errp, callback, opaque); - qapi_free_InetSocketAddress(addr); - } - return sock; -} - #ifndef _WIN32 static int unix_listen_saddr(UnixSocketAddress *saddr, |