[PULL,06/34] block/nbd: connect_thread_func(): do qio_channel_set_delay(false)

Commit Message

Eric Blake June 15, 2021, 8:47 p.m. UTC

From: Vladimir Sementsov-Ogievskiy <[e-mail]>

nbd_open() does it (through nbd_establish_connection()).
Actually we lost that call on reconnect path in 1dc4718d849e1a1fe
"block/nbd: use non-blocking connect: fix vm hang on connect()"
when we have introduced reconnect thread.

Fixes: 1dc4718d849e1a1fe665ce5241ed79048cfa2cfc
Signed-off-by: Vladimir Sementsov-Ogievskiy <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: Eric Blake <[e-mail]>
Signed-off-by: Eric Blake <[e-mail]>
---
 block/nbd.c | 2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/block/nbd.c b/block/nbd.c
index 01d2c2efad63..f3a036354dc7 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -408,6 +408,8 @@  static void *connect_thread_func(void *opaque)
         thr->sioc = NULL;
     }

+    qio_channel_set_delay(QIO_CHANNEL(thr->sioc), false);
+
     qemu_mutex_lock(&thr->mutex);

     switch (thr->state) {