diff options
| author | Vladimir Sementsov-Ogievskiy | 2021-06-10 12:07:34 +0200 |
|---|---|---|
| committer | Eric Blake | 2021-06-18 17:59:53 +0200 |
| commit | fb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02 (patch) | |
| tree | 320645cba625aaaf109bd50c05eee71da13cfe8d /block | |
| parent | block/nbd: fix how state is cleared on nbd_open() failure paths (diff) | |
| download | qemu-fb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02.tar.gz qemu-fb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02.tar.xz qemu-fb392b548eb4c6c2b2c7689e7fc6b1d2077d4f02.zip | |
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')
| -rw-r--r-- | block/nbd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/nbd.c b/block/nbd.c index 01d2c2efad..f3a036354d 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) { |