[Libguestfs] [PATCH libnbd 3/3] lib/connect.c: Fail synchronous nbd_connect_command if multi-conn is set.

However we don't modify the asynchronous call, continuing the general policy of allowing users to do what they want with AIO even if it is unwise. --- lib/connect.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/connect.c b/lib/connect.c index c5970d2..61d945f 100644 --- a/lib/connect.c +++ b/lib/connect.c @@ -150,12 +150,15 @@ nbd_unlocked_connect_tcp (struct nbd_handle *h, return wait_all_connected (h); } -/* Connect to a local command. Multi-conn doesn't make much sense - * here, should it be an error? - */ +/* Connect to a local command. */ int nbd_unlocked_connect_command (struct nbd_handle *h, char **argv) { + if (h->multi_conn > 1) { + set_error (EINVAL, "multi-conn cannot be used when connecting to a command"); + return -1; + } + if (!nbd_unlocked_aio_is_created (h->conns[0])) { set_error (0, "first connection in this handle is not in the created state, this is likely to be caused by a programming error in the calling program"); return -1; -- 2.21.0