aboutsummaryrefslogtreecommitdiff
path: root/block/nbd.c
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2021-06-10 13:07:34 +0300
committerEric Blake <eblake@redhat.com>2021-06-18 10:59:53 -0500
commitfb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02 (patch)
tree320645cba625aaaf109bd50c05eee71da13cfe8d /block/nbd.c
parentbbba1c376b8b1ba5171bd14eb6bf212fa1173ddb (diff)
downloadqemu-fb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02.zip
qemu-fb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02.tar.gz
qemu-fb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02.tar.bz2
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>
Diffstat (limited to 'block/nbd.c')
-rw-r--r--block/nbd.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/block/nbd.c b/block/nbd.c
index 01d2c2e..f3a0363 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) {