Patchwork socket: allow wait=false for client socket

login
register
mail settings
Submitter marcandre.lureau@redhat.com
Date April 15, 2019, 3:49 p.m.
Message ID <20190415154906.14621-1-marcandre.lureau@redhat.com>
Download mbox | patch
Permalink /patch/773331/
State New
Headers show

Comments

marcandre.lureau@redhat.com - April 15, 2019, 3:49 p.m.
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é <berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 chardev/char-socket.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Daniel P. Berrange - April 15, 2019, 3:56 p.m.
On Mon, Apr 15, 2019 at 05:49:06PM +0200, Marc-André Lureau wrote:
> 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é <berrange@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  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");

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Though, I think we should issue a deprecation warning if 'has_wait' is
set, because this is still user error, and it would be good to make it
stricter again later.


Regards,
Daniel
Eric Blake - April 15, 2019, 4:19 p.m.
On 4/15/19 10:49 AM, Marc-André Lureau wrote:
> 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é <berrange@redhat.com>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  chardev/char-socket.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

According to Fixes, this is a regression in 4.0. Is it worth having this
fix in -rc4?

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

Patch

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