[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 2/5] Revert "chardev: tcp: postpone async connect
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 2/5] Revert "chardev: tcp: postpone async connection setup" |
Date: |
Thu, 23 Aug 2018 16:31:22 +0200 |
This reverts commit 25679e5d58e258e9950685ffbd0cae4cd40d9cc2.
This commit broke "reconnect socket" chardev that are created after
"machine_done": they no longer try to connect. It broke also
vhost-user-test that uses chardev while there is no "machine_done"
event.
The goal of this patch was to move the "connect" source to the
frontend context. chr->gcontext is set with
qemu_chr_fe_set_handlers(). But there is no guarantee that it will be
called, so we can't delay connection until then: the chardev should
still attempt to connect during open(). qemu_chr_fe_set_handlers() is
eventually called later and will update the context.
Unless there is a good reason to not use initially the default
context, I think we should revert to the previous state to fix the
regressions.
Signed-off-by: Marc-André Lureau <address@hidden>
---
chardev/char-socket.c | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index e28d2cca4c..14f6567f6a 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1005,8 +1005,9 @@ static void qmp_chardev_open_socket(Chardev *chr,
s->reconnect_time = reconnect;
}
- /* If reconnect_time is set, will do that in chr_machine_done. */
- if (!s->reconnect_time) {
+ if (s->reconnect_time) {
+ tcp_chr_connect_async(chr);
+ } else {
if (s->is_listen) {
char *name;
s->listener = qio_net_listener_new();
@@ -1155,17 +1156,6 @@ char_socket_get_connected(Object *obj, Error **errp)
return s->connected;
}
-static int tcp_chr_machine_done_hook(Chardev *chr)
-{
- SocketChardev *s = SOCKET_CHARDEV(chr);
-
- if (s->reconnect_time) {
- tcp_chr_connect_async(chr);
- }
-
- return 0;
-}
-
static void char_socket_class_init(ObjectClass *oc, void *data)
{
ChardevClass *cc = CHARDEV_CLASS(oc);
@@ -1181,7 +1171,6 @@ static void char_socket_class_init(ObjectClass *oc, void
*data)
cc->chr_add_client = tcp_chr_add_client;
cc->chr_add_watch = tcp_chr_add_watch;
cc->chr_update_read_handler = tcp_chr_update_read_handler;
- cc->chr_machine_done = tcp_chr_machine_done_hook;
object_class_property_add(oc, "addr", "SocketAddress",
char_socket_get_addr, NULL,
--
2.18.0.547.g1d89318c48
- [Qemu-devel] [PATCH v2 0/5] Fix socket chardev regression, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 1/5] Revert "chardev: tcp: postpone TLS work until machine done", Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 2/5] Revert "chardev: tcp: postpone async connection setup",
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 3/5] char-socket: update all ioc handlers when changing context, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 4/5] test-char: fix random socket test failure, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 5/5] test-char: add socket reconnect test, Marc-André Lureau, 2018/08/23
- Re: [Qemu-devel] [PATCH v2 0/5] Fix socket chardev regression, Peter Xu, 2018/08/23