[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/9] chardev: use chardev's gcontext for async conne
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH 6/9] chardev: use chardev's gcontext for async connect |
Date: |
Mon, 5 Mar 2018 14:50:37 +0800 |
Generalize the function to create the async QIO task connection. Also,
fix the context pointer to use the chardev's gcontext.
Reviewed-by: Paolo Bonzini <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
chardev/char-socket.c | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index c22b3f330c..1ce5adad9a 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -901,11 +901,22 @@ cleanup:
object_unref(OBJECT(sioc));
}
+static void tcp_chr_connect_async(Chardev *chr)
+{
+ SocketChardev *s = SOCKET_CHARDEV(chr);
+ QIOChannelSocket *sioc;
+
+ sioc = qio_channel_socket_new();
+ tcp_chr_set_client_ioc_name(chr, sioc);
+ qio_channel_socket_connect_async(sioc, s->addr,
+ qemu_chr_socket_connected,
+ chr, NULL, chr->gcontext);
+}
+
static gboolean socket_reconnect_timeout(gpointer opaque)
{
Chardev *chr = CHARDEV(opaque);
SocketChardev *s = SOCKET_CHARDEV(opaque);
- QIOChannelSocket *sioc;
g_source_unref(s->reconnect_timer);
s->reconnect_timer = NULL;
@@ -914,11 +925,7 @@ static gboolean socket_reconnect_timeout(gpointer opaque)
return false;
}
- sioc = qio_channel_socket_new();
- tcp_chr_set_client_ioc_name(chr, sioc);
- qio_channel_socket_connect_async(sioc, s->addr,
- qemu_chr_socket_connected,
- chr, NULL, NULL);
+ tcp_chr_connect_async(chr);
return false;
}
@@ -998,11 +1005,7 @@ static void qmp_chardev_open_socket(Chardev *chr,
}
if (s->reconnect_time) {
- sioc = qio_channel_socket_new();
- tcp_chr_set_client_ioc_name(chr, sioc);
- qio_channel_socket_connect_async(sioc, s->addr,
- qemu_chr_socket_connected,
- chr, NULL, NULL);
+ tcp_chr_connect_async(chr);
} else {
if (s->is_listen) {
char *name;
--
2.14.3
- [Qemu-devel] [PATCH 0/9] chardev: qio related non-default context support, Peter Xu, 2018/03/05
- [Qemu-devel] [PATCH 1/9] vl: export machine_init_done, Peter Xu, 2018/03/05
- [Qemu-devel] [PATCH 2/9] chardev: fix leak in tcp_chr_telnet_init_io(), Peter Xu, 2018/03/05
- [Qemu-devel] [PATCH 3/9] chardev: update net listener gcontext, Peter Xu, 2018/03/05
- [Qemu-devel] [PATCH 4/9] chardev: allow telnet gsource to switch gcontext, Peter Xu, 2018/03/05
- [Qemu-devel] [PATCH 6/9] chardev: use chardev's gcontext for async connect,
Peter Xu <=
- [Qemu-devel] [PATCH 5/9] chardev: introduce chr_machine_done hook, Peter Xu, 2018/03/05
- [Qemu-devel] [PATCH 7/9] chardev: tcp: postpone async connection setup, Peter Xu, 2018/03/05
- [Qemu-devel] [PATCH 8/9] chardev: tcp: let TLS run on chardev context, Peter Xu, 2018/03/05
- [Qemu-devel] [PATCH 9/9] chardev: tcp: postpone TLS work until machine done, Peter Xu, 2018/03/05
- Re: [Qemu-devel] [PATCH 0/9] chardev: qio related non-default context support, no-reply, 2018/03/05