| Message ID | 20210224131142.1952027-9-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | deprecations: remove many old deprecations | expand |
On Wed, Feb 24, 2021 at 5:15 PM Daniel P. Berrangé <berrange@redhat.com> wrote: > This only makes sense conceptually when used with listener chardevs. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- > chardev/char-socket.c | 12 ++++-------- > docs/system/deprecated.rst | 6 ------ > docs/system/removed-features.rst | 6 ++++++ > 3 files changed, 10 insertions(+), 14 deletions(-) > > diff --git a/chardev/char-socket.c b/chardev/char-socket.c > index 9061981f6d..b24618b581 100644 > --- a/chardev/char-socket.c > +++ b/chardev/char-socket.c > @@ -1336,14 +1336,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; > } > } > > diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst > index 78474f0845..c69887dca8 100644 > --- a/docs/system/deprecated.rst > +++ b/docs/system/deprecated.rst > @@ -192,12 +192,6 @@ Since the ``dirty-bitmaps`` field is optionally > present in both the old and > new locations, clients must use introspection to learn where to anticipate > the field if/when it does appear in command output. > > -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 > - > ``nbd-server-add`` and ``nbd-server-remove`` (since 5.2) > '''''''''''''''''''''''''''''''''''''''''''''''''''''''' > > diff --git a/docs/system/removed-features.rst > b/docs/system/removed-features.rst > index 7942c2e513..870a222062 100644 > --- a/docs/system/removed-features.rst > +++ b/docs/system/removed-features.rst > @@ -106,6 +106,12 @@ The ``query-cpus`` command is replaced by the > ``query-cpus-fast`` command. > The ``arch`` output member of the ``query-cpus-fast`` command is > replaced by the ``target`` output member. > > +chardev client socket with ``wait`` option (removed in 6.0) > +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' > + > +Character devices creating sockets in client mode should not specify > +the 'wait' field, which is only applicable to sockets in server mode > + > Human Monitor Protocol (HMP) commands > ------------------------------------- > > -- > 2.29.2 > >
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 9061981f6d..b24618b581 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1336,14 +1336,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; } } diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 78474f0845..c69887dca8 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -192,12 +192,6 @@ Since the ``dirty-bitmaps`` field is optionally present in both the old and new locations, clients must use introspection to learn where to anticipate the field if/when it does appear in command output. -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 - ``nbd-server-add`` and ``nbd-server-remove`` (since 5.2) '''''''''''''''''''''''''''''''''''''''''''''''''''''''' diff --git a/docs/system/removed-features.rst b/docs/system/removed-features.rst index 7942c2e513..870a222062 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -106,6 +106,12 @@ The ``query-cpus`` command is replaced by the ``query-cpus-fast`` command. The ``arch`` output member of the ``query-cpus-fast`` command is replaced by the ``target`` output member. +chardev client socket with ``wait`` option (removed in 6.0) +''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +Character devices creating sockets in client mode should not specify +the 'wait' field, which is only applicable to sockets in server mode + Human Monitor Protocol (HMP) commands -------------------------------------
This only makes sense conceptually when used with listener chardevs. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- chardev/char-socket.c | 12 ++++-------- docs/system/deprecated.rst | 6 ------ docs/system/removed-features.rst | 6 ++++++ 3 files changed, 10 insertions(+), 14 deletions(-)