diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2021-02-22 13:47:17 +0000 |
|---|---|---|
| committer | Daniel P. Berrangé <berrange@redhat.com> | 2021-03-18 09:22:55 +0000 |
| commit | 24e13a4dc1eb1630eceffc7ab334145d902e763d (patch) | |
| tree | f07446e4ca25ca193b036ad4fa5de349147b3c72 | |
| parent | 445a5b4087567bf4d4ce76d394adf78d9d5c88a5 (diff) | |
chardev: reject use of 'wait' flag for socket client chardevs
This only makes sense conceptually when used with listener chardevs.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
| -rw-r--r-- | chardev/char-socket.c | 12 | ||||
| -rw-r--r-- | docs/system/deprecated.rst | 6 | ||||
| -rw-r--r-- | 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 c8bced76b7..f618bdec28 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1339,14 +1339,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 30c5969e22..eed35fd004 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -228,12 +228,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 ce1087c6a7..33b8c08f9b 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -104,6 +104,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 ------------------------------------- |