[PULL,08/34] block/nbd: call socket_address_parse_named_fd() in advance

Commit Message

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

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

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 <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: Eric Blake <[e-mail]>
Signed-off-by: Eric Blake <[e-mail]>
---
 block/nbd.c | 6 ++++++
 1 file changed, 6 insertions(+)

Patch

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);