[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 11/21] char-socket: introduce update_disconnected_fil
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 11/21] char-socket: introduce update_disconnected_filename() |
Date: |
Thu, 4 May 2017 15:42:22 +0400 |
This helper will be used in yet another place in the following patch.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <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 2789eb1f40..511a82960d 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -366,6 +366,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);
@@ -380,8 +389,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);
@@ -875,8 +883,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.12.0.191.gc5d8de91d
- [Qemu-devel] [PULL 01/21] char: remove qemu_chr_be_generic_open, (continued)
- [Qemu-devel] [PULL 01/21] char: remove qemu_chr_be_generic_open, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 02/21] mux: simplfy muxes_realize_done, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 03/21] xen: use a better chardev type check, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 04/21] container: don't leak container reference, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 06/21] vl: add todo note about root container cleanup, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 05/21] char: add a /chardevs container, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 07/21] char: use /chardevs container instead of chardevs list, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 08/21] char: remove qemu_chardev_add, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 09/21] char: remove chardevs list, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 10/21] char: useless NULL check, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 11/21] char-socket: introduce update_disconnected_filename(),
Marc-André Lureau <=
- [Qemu-devel] [PULL 12/21] char-socket: update local address after listen, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 13/21] char-socket: add 'addr' property, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 14/21] char-socket: add 'connected' property, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 15/21] char-udp: flush as much buffer as possible, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 16/21] tests: add alias check in /char/ringbuf, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 17/21] tests: add /char/pipe test, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 18/21] tests: add /char/file test, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 19/21] tests: add /char/socket test, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 20/21] tests: add /char/udp test, Marc-André Lureau, 2017/05/04
- [Qemu-devel] [PULL 21/21] tests: add /char/console test, Marc-André Lureau, 2017/05/04