[Qemu-devel] [PATCH] socket: allow wait=false for client socket

[Marc-André Lureau]

Commit 767abe7 ("chardev: forbid 'wait' option with client sockets")
is a bit too strict. Current libvirt always set wait=false, and will
thus fail to add client chardev.

Make the code more permissive, allowing wait=false with client socket
chardevs.

Fixes: 767abe7f49e8be14d29da5db3527817b5d696a52
Cc: Daniel P. Berrangé <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
 chardev/char-socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index 3916505d67..2ad9c9eea5 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1262,7 +1262,7 @@ static bool qmp_chardev_validate_socket(ChardevSocket 
*sock,
             error_setg(errp, "%s", "Websocket client is not implemented");
             return false;
         }
-        if (sock->has_wait) {
+        if (sock->has_wait && sock->wait) {
             error_setg(errp, "%s",
                        "'wait' option is incompatible with "
                        "socket in client connect mode");
-- 
2.21.0.313.ge35b8cb8e2