Re: [libvirt] [PATCH v3] socket: allow wait=false for client socket

On Mon, Apr 15, 2019 at 06:21:29PM +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. Deprecate usage of 'wait' with client sockets. > > Fixes: 767abe7f49e8be14d29da5db3527817b5d696a52 > Cc: Daniel P. Berrangé <berrange(a)redhat.com&gt; > Signed-off-by: Marc-André Lureau <marcandre.lureau(a)redhat.com&gt; > --- > chardev/char-socket.c | 10 +++++++--- > qemu-deprecated.texi | 5 +++++ > 2 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/chardev/char-socket.c b/chardev/char-socket.c > index 3916505d67..ebc1adb83e 100644 > --- a/chardev/char-socket.c > +++ b/chardev/char-socket.c > @@ -1263,9 +1263,13 @@ 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"); > + 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; Oh wait, don't you need to put the 'return false' inside the if branch above, otherwise we're still failing validation.

> } > } > diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi > index 2219386769..842e71b11d 100644 > --- a/qemu-deprecated.texi > +++ b/qemu-deprecated.texi > @@ -105,6 +105,11 @@ details. > The ``query-events'' command has been superseded by the more powerful > and accurate ``query-qmp-schema'' command. > > +@subsection chardev client socket with 'wait' option (since 4.0) > + > +Character devices creating sockets in client mode should not specify > +the 'wait' field, which is only applicable to sockets in server mode > + > @section Human Monitor Protocol (HMP) commands > > @subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1) > -- > 2.21.0.313.ge35b8cb8e2 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|