| Message ID | 20190415163337.2795-1-marcandre.lureau@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v4] socket: allow wait=false for client socket | expand |
On Mon, Apr 15, 2019 at 06:33:36PM +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 IOW, this is a regression in 4.0 and so desirable to fix in rc4 to avoid breaking with existing libvirt. Meanwhile libvirt should also be fixed to not pass 'wait' for client sockets. > Cc: Daniel P. Berrangé <berrange@redhat.com> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > chardev/char-socket.c | 12 ++++++++---- > qemu-deprecated.texi | 5 +++++ > 2 files changed, 13 insertions(+), 4 deletions(-) Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
On Mon, 15 Apr 2019 at 17:34, Marc-André Lureau <marcandre.lureau@redhat.com> 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@redhat.com> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- Applied to master for rc4, thanks. -- PMM
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; + } } } 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)
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> --- chardev/char-socket.c | 12 ++++++++---- qemu-deprecated.texi | 5 +++++ 2 files changed, 13 insertions(+), 4 deletions(-)