diff mbox

[v3,11/21] char-socket: introduce update_disconnected_filename()

Message ID 20170316092121.25672-12-marcandre.lureau@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Marc-André Lureau March 16, 2017, 9:21 a.m. UTC 
This helper will be used in yet another place in the following patch.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 chardev/char-socket.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

Comments

Philippe Mathieu-Daudé April 11, 2017, 2:56 a.m. UTC | #1 
On 03/16/2017 06:21 AM, Marc-André Lureau wrote:
> This helper will be used in yet another place in the following patch.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---
>  chardev/char-socket.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/chardev/char-socket.c b/chardev/char-socket.c
> index dc3d3532a7..e3b5288af7 100644
> --- a/chardev/char-socket.c
> +++ b/chardev/char-socket.c
> @@ -363,6 +363,15 @@ static char *SocketAddress_to_str(const char *prefix, SocketAddress *addr,
>      }
>  }
>
> +static void update_disconnected_filename(SocketChardev *s)
> +{
> +    Chardev *chr = CHARDEV(s);
> +
> +    g_free(chr->filename);
> +    chr->filename = SocketAddress_to_str("disconnected:", s->addr,
> +                                         s->is_listen, s->is_telnet);
> +}
> +
>  static void tcp_chr_disconnect(Chardev *chr)
>  {
>      SocketChardev *s = SOCKET_CHARDEV(chr);
> @@ -377,8 +386,7 @@ static void tcp_chr_disconnect(Chardev *chr)
>          s->listen_tag = qio_channel_add_watch(
>              QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL);
>      }
> -    chr->filename = SocketAddress_to_str("disconnected:", s->addr,
> -                                         s->is_listen, s->is_telnet);
> +    update_disconnected_filename(s);
>      qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
>      if (s->reconnect_time) {
>          qemu_chr_socket_restart_timer(chr);
> @@ -872,8 +880,7 @@ static void qmp_chardev_open_socket(Chardev *chr,
>      /* be isn't opened until we get a connection */
>      *be_opened = false;
>
> -    chr->filename = SocketAddress_to_str("disconnected:",
> -                                         addr, is_listen, is_telnet);
> +    update_disconnected_filename(s);
>
>      if (is_listen) {
>          if (is_telnet) {
>
diff mbox

Patch

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index dc3d3532a7..e3b5288af7 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -363,6 +363,15 @@  static char *SocketAddress_to_str(const char *prefix, SocketAddress *addr,
     }
 }
 
+static void update_disconnected_filename(SocketChardev *s)
+{
+    Chardev *chr = CHARDEV(s);
+
+    g_free(chr->filename);
+    chr->filename = SocketAddress_to_str("disconnected:", s->addr,
+                                         s->is_listen, s->is_telnet);
+}
+
 static void tcp_chr_disconnect(Chardev *chr)
 {
     SocketChardev *s = SOCKET_CHARDEV(chr);
@@ -377,8 +386,7 @@  static void tcp_chr_disconnect(Chardev *chr)
         s->listen_tag = qio_channel_add_watch(
             QIO_CHANNEL(s->listen_ioc), G_IO_IN, tcp_chr_accept, chr, NULL);
     }
-    chr->filename = SocketAddress_to_str("disconnected:", s->addr,
-                                         s->is_listen, s->is_telnet);
+    update_disconnected_filename(s);
     qemu_chr_be_event(chr, CHR_EVENT_CLOSED);
     if (s->reconnect_time) {
         qemu_chr_socket_restart_timer(chr);
@@ -872,8 +880,7 @@  static void qmp_chardev_open_socket(Chardev *chr,
     /* be isn't opened until we get a connection */
     *be_opened = false;
 
-    chr->filename = SocketAddress_to_str("disconnected:",
-                                         addr, is_listen, is_telnet);
+    update_disconnected_filename(s);
 
     if (is_listen) {
         if (is_telnet) {