summary refs log tree commit diff stats
path: root/chardev/char-socket.c
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2021-02-22 13:47:17 +0000
committerDaniel P. Berrangé <berrange@redhat.com>2021-03-18 09:22:55 +0000
commit24e13a4dc1eb1630eceffc7ab334145d902e763d (patch)
treef07446e4ca25ca193b036ad4fa5de349147b3c72 /chardev/char-socket.c
parent445a5b4087567bf4d4ce76d394adf78d9d5c88a5 (diff)
downloadfocaccia-qemu-24e13a4dc1eb1630eceffc7ab334145d902e763d.tar.gz
focaccia-qemu-24e13a4dc1eb1630eceffc7ab334145d902e763d.zip
chardev: reject use of 'wait' flag for socket client chardevs
This only makes sense conceptually when used with listener chardevs.

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'chardev/char-socket.c')
-rw-r--r--chardev/char-socket.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index c8bced76b7..f618bdec28 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -1339,14 +1339,10 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock,
             return false;
         }
         if (sock->has_wait) {
-            warn_report("'wait' option is deprecated with "
-                        "socket in client connect mode");
-            if (sock->wait) {
-                error_setg(errp, "%s",
-                           "'wait' option is incompatible with "
-                           "socket in client connect mode");
-                return false;
-            }
+            error_setg(errp, "%s",
+                       "'wait' option is incompatible with "
+                       "socket in client connect mode");
+            return false;
         }
     }