[Qemu-devel] [PATCH v2 0/2] Drop some useless functions

[Qemu-devel] [PATCH v2 0/2] Drop some useless functions

[Cao jin]

These functions are not used anymore, drop them first.
Next step is to rip out NonBlockingConnectHandler as Daniel suggested.

Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Eric Blake <eblake@redhat.com>

Cao jin (2):
  util: Drop unused *_nonblocking_connect() functions
  util: Drop inet_listen()

 include/qemu/sockets.h |  8 ------
 util/qemu-sockets.c    | 74 --------------------------------------------------
 2 files changed, 82 deletions(-)

-- 
2.1.0

[Qemu-devel] [PATCH v2 1/2] util: Drop unused *_nonblocking_connect() functions

[Cao jin]

Since commit e65c67e4 & d984464e, they are not used anymore, and all
non-blocking connect now goes through inet_connect_addr().

Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Eric Blake <eblake@redhat.com>

Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
 include/qemu/sockets.h |  6 ------
 util/qemu-sockets.c    | 46 ----------------------------------------------
 2 files changed, 52 deletions(-)

This patch is squashed as Eric suggested. As v1 has been reviewed-by,
so I take the liberty to add Eric's R-b in this v2.

diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 5fe01fb..28a28c0 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -36,17 +36,11 @@ 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);
 
 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 fb83d48..0962646 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,
@@ -893,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;
-- 
2.1.0

[Qemu-devel] [PATCH v2 2/2] util: Drop inet_listen()

[Cao jin]

Since commit e65c67e4, inet_listen() is not used anymore, and all
inet listen operation goes through QIOChannel.

Cc: Daniel P. Berrange <berrange@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Eric Blake <eblake@redhat.com>

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
 include/qemu/sockets.h |  2 --
 util/qemu-sockets.c    | 28 ----------------------------
 2 files changed, 30 deletions(-)

diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 28a28c0..9eb2470 100644
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -33,8 +33,6 @@ int socket_set_fast_reuse(int fd);
 typedef void NonBlockingConnectHandler(int fd, Error *err, void *opaque);
 
 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);
 
 NetworkAddressFamily inet_netfamily(int family);
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 0962646..b4314ca 100644
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -624,34 +624,6 @@ fail:
     return NULL;
 }
 
-int inet_listen(const char *str, char *ostr, int olen,
-                int socktype, int port_offset, Error **errp)
-{
-    char *optstr;
-    int sock = -1;
-    InetSocketAddress *addr;
-
-    addr = inet_parse(str, errp);
-    if (addr != NULL) {
-        sock = inet_listen_saddr(addr, port_offset, true, errp);
-        if (sock != -1 && ostr) {
-            optstr = strchr(str, ',');
-            if (addr->ipv6) {
-                snprintf(ostr, olen, "[%s]:%s%s",
-                         addr->host,
-                         addr->port,
-                         optstr ? optstr : "");
-            } else {
-                snprintf(ostr, olen, "%s:%s%s",
-                         addr->host,
-                         addr->port,
-                         optstr ? optstr : "");
-            }
-        }
-        qapi_free_InetSocketAddress(addr);
-    }
-    return sock;
-}
 
 /**
  * Create a blocking socket and connect it to an address.
-- 
2.1.0

Re: [Qemu-devel] [PATCH v2 0/2] Drop some useless functions

[Cao jin]

Sorry to forgot the v2 changelog:

1, squash two patches into one, and update commit message as Paolo & 
Eric suggest.
2. Drop another function that is not used

On 07/25/2016 09:02 PM, Cao jin wrote:
> These functions are not used anymore, drop them first.
> Next step is to rip out NonBlockingConnectHandler as Daniel suggested.
>
> Cc: Daniel P. Berrange <berrange@redhat.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Eric Blake <eblake@redhat.com>
>
> Cao jin (2):
>    util: Drop unused *_nonblocking_connect() functions
>    util: Drop inet_listen()
>
>   include/qemu/sockets.h |  8 ------
>   util/qemu-sockets.c    | 74 --------------------------------------------------
>   2 files changed, 82 deletions(-)
>

-- 
Yours Sincerely,

Cao jin

Re: [Qemu-devel] [PATCH v2 1/2] util: Drop unused *_nonblocking_connect() functions

[Daniel P. Berrange]

On Mon, Jul 25, 2016 at 09:02:50PM +0800, Cao jin wrote:
> Since commit e65c67e4 & d984464e, they are not used anymore, and all
> non-blocking connect now goes through inet_connect_addr().
> 
> Cc: Daniel P. Berrange <berrange@redhat.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Eric Blake <eblake@redhat.com>
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
>  include/qemu/sockets.h |  6 ------
>  util/qemu-sockets.c    | 46 ----------------------------------------------
>  2 files changed, 52 deletions(-)

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

Re: [Qemu-devel] [PATCH v2 2/2] util: Drop inet_listen()

[Daniel P. Berrange]

On Mon, Jul 25, 2016 at 09:02:51PM +0800, Cao jin wrote:
> Since commit e65c67e4, inet_listen() is not used anymore, and all
> inet listen operation goes through QIOChannel.
> 
> Cc: Daniel P. Berrange <berrange@redhat.com>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Eric Blake <eblake@redhat.com>
> 
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
>  include/qemu/sockets.h |  2 --
>  util/qemu-sockets.c    | 28 ----------------------------
>  2 files changed, 30 deletions(-)

Reviewed-by: Daniel P. Berrange <berrange@redhat.com>

> diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
> index 28a28c0..9eb2470 100644
> --- a/include/qemu/sockets.h
> +++ b/include/qemu/sockets.h
> @@ -33,8 +33,6 @@ int socket_set_fast_reuse(int fd);
>  typedef void NonBlockingConnectHandler(int fd, Error *err, void *opaque);

There's still scope for a 3rd patch to remove this NonBlockingConnectHandler
typedef, since nothing uses it anymore.


Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|

Re: [Qemu-devel] [PATCH v2 2/2] util: Drop inet_listen()

[Cao jin]

On 07/27/2016 07:36 PM, Daniel P. Berrange wrote:
> On Mon, Jul 25, 2016 at 09:02:51PM +0800, Cao jin wrote:
>> Since commit e65c67e4, inet_listen() is not used anymore, and all
>> inet listen operation goes through QIOChannel.
>>
>> Cc: Daniel P. Berrange <berrange@redhat.com>
>> Cc: Gerd Hoffmann <kraxel@redhat.com>
>> Cc: Paolo Bonzini <pbonzini@redhat.com>
>> Cc: Eric Blake <eblake@redhat.com>
>>
>> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
>> ---
>>   include/qemu/sockets.h |  2 --
>>   util/qemu-sockets.c    | 28 ----------------------------
>>   2 files changed, 30 deletions(-)
>
> Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
>
>> diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
>> index 28a28c0..9eb2470 100644
>> --- a/include/qemu/sockets.h
>> +++ b/include/qemu/sockets.h
>> @@ -33,8 +33,6 @@ int socket_set_fast_reuse(int fd);
>>   typedef void NonBlockingConnectHandler(int fd, Error *err, void *opaque);
>
> There's still scope for a 3rd patch to remove this NonBlockingConnectHandler
> typedef, since nothing uses it anymore.
>

Definitely, I am working on the patch that remove the whole obsolete 
non-blocking connecting mechanism.

>
> Regards,
> Daniel
>

-- 
Yours Sincerely,

Cao jin