[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/22] char-socket: introduce update_disconnected_fi
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH 12/22] char-socket: introduce update_disconnected_filename() |
Date: |
Thu, 2 Feb 2017 18:51:31 +0400 |
This helper will be used in yet another place in the following patch.
Signed-off-by: Marc-André Lureau <address@hidden>
---
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 00b7de3cc4..1f2377bb4e 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -353,6 +353,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);
@@ -367,8 +376,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);
@@ -862,8 +870,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) {
--
2.11.0.295.gd7dffce1c.dirty
- Re: [Qemu-devel] [PATCH 06/22] char: add a /chardevs container, (continued)
[Qemu-devel] [PATCH 07/22] char: use /chardevs container instead of chardevs list, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 08/22] char: remove qemu_chardev_add, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 09/22] char: remove chardevs list, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 10/22] char: useless NULL check, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 11/22] qcow2: remove useless NULL check, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 12/22] char-socket: introduce update_disconnected_filename(),
Marc-André Lureau <=
[Qemu-devel] [PATCH 13/22] char-socket: update local address after listen, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 14/22] char-socket: add 'addr' property, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 15/22] char-socket: add 'connected' property, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 16/22] char-udp: flush as much buffer as possible, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 17/22] tests: add alias check in /char/ringbuf, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 18/22] tests: add /char/pipe test, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 19/22] tests: add /char/file test, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 20/22] tests: add /char/socket test, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 21/22] tests: add /char/udp test, Marc-André Lureau, 2017/02/02
[Qemu-devel] [PATCH 22/22] tests: add /char/console test, Marc-André Lureau, 2017/02/02