aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCao jin <caoj.fnst@cn.fujitsu.com>2016-07-21 18:33:33 +0800
committerPaolo Bonzini <pbonzini@redhat.com>2016-08-02 12:03:58 +0200
commitf8ea7a8656a807a8a3e4e2389059679716a75baa (patch)
tree92ca0451e7e578b0ea7bc6cdaa26167f6a571150
parent00432b69538559285ca55677c1002cad556aea50 (diff)
downloadqemu-f8ea7a8656a807a8a3e4e2389059679716a75baa.zip
qemu-f8ea7a8656a807a8a3e4e2389059679716a75baa.tar.gz
qemu-f8ea7a8656a807a8a3e4e2389059679716a75baa.tar.bz2
util: drop unix_nonblocking_connect()
It is never used; all nonblocking connect now goes through socket_connect(), which calls unix_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-3-git-send-email-caoj.fnst@cn.fujitsu.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--include/qemu/sockets.h3
-rw-r--r--util/qemu-sockets.c16
2 files changed, 0 insertions, 19 deletions
diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 2cbe643..28a28c0 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -41,9 +41,6 @@ NetworkAddressFamily inet_netfamily(int family);
int unix_listen(const char *path, char *ostr, int olen, Error **errp);
int unix_connect(const char *path, Error **errp);
-int unix_nonblocking_connect(const char *str,
- NonBlockingConnectHandler *callback,
- void *opaque, Error **errp);
SocketAddress *socket_parse(const char *str, Error **errp);
int socket_connect(SocketAddress *addr, Error **errp,
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 2e0570b..58f9a2c 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -863,22 +863,6 @@ int unix_connect(const char *path, Error **errp)
}
-int unix_nonblocking_connect(const char *path,
- NonBlockingConnectHandler *callback,
- void *opaque, Error **errp)
-{
- UnixSocketAddress *saddr;
- int sock = -1;
-
- g_assert(callback != NULL);
-
- saddr = g_new0(UnixSocketAddress, 1);
- saddr->path = g_strdup(path);
- sock = unix_connect_saddr(saddr, errp, callback, opaque);
- qapi_free_UnixSocketAddress(saddr);
- return sock;
-}
-
SocketAddress *socket_parse(const char *str, Error **errp)
{
SocketAddress *addr;