From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Date: Thu, 10 Jun 2021 10:07:34 +0000 (+0300)
Subject: block/nbd: connect_thread_func(): do qio_channel_set_delay(false)
X-Git-Tag: v6.1.0-rc0~68^2~28
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02;p=thirdparty%2Fqemu.git

block/nbd: connect_thread_func(): do qio_channel_set_delay(false)

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 <vsementsov@virtuozzo.com>
Message-Id: <20210610100802.5888-5-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/block/nbd.c b/block/nbd.c
index 01d2c2efad6..f3a036354dc 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) {