diff options
| author | Marc-André Lureau | 2019-04-15 18:33:36 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-04-16 11:40:43 +0200 |
| commit | a9b305ba291fb74f7ff732b3d7b8f4c812431ddf (patch) | |
| tree | 25da26aceff0b3d420701fb2c669f0d262047599 /chardev | |
| parent | Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into sta... (diff) | |
| download | qemu-a9b305ba291fb74f7ff732b3d7b8f4c812431ddf.tar.gz qemu-a9b305ba291fb74f7ff732b3d7b8f4c812431ddf.tar.xz qemu-a9b305ba291fb74f7ff732b3d7b8f4c812431ddf.zip | |
socket: allow wait=false for client socket
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. Deprecate usage of 'wait' with client sockets.
Fixes: 767abe7f49e8be14d29da5db3527817b5d696a52
Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 20190415163337.2795-1-marcandre.lureau@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'chardev')
| -rw-r--r-- | chardev/char-socket.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 3916505d67..b2cf593107 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1263,10 +1263,14 @@ static bool qmp_chardev_validate_socket(ChardevSocket *sock, return false; } if (sock->has_wait) { - error_setg(errp, "%s", - "'wait' option is incompatible with " - "socket in client connect mode"); - return false; + 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; + } } } |