From: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Detecting monitor by current coroutine works bad when we are not in
coroutine context. And that's exactly so in nbd reconnect code, where
qio_channel_socket_connect_sync() is called from thread.
Monitor is needed only to parse named file descriptor. So, let's just
parse it during nbd_open(), so that all further users of s->saddr don't
need to access monitor.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Message-Id: <20210610100802.5888-7-vsement...@virtuozzo.com>
Reviewed-by: Eric Blake <ebl...@redhat.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
block/nbd.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index f3a036354dc7..1c99654ef7e5 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -2140,6 +2140,12 @@ static SocketAddress *nbd_config(BDRVNBDState *s, QDict
*options,
goto done;
}
+ if (socket_address_parse_named_fd(saddr, errp) < 0) {
+ qapi_free_SocketAddress(saddr);
+ saddr = NULL;
+ goto done;
+ }
+
done:
qobject_unref(addr);
visit_free(iv);
--
2.31.1
