[PATCH v2 07/13] 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(a)redhat.com&gt; Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- 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 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 f196bbb9ec..9afff39e5e 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -229,12 +229,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 51f0e308d9..9f3697afec 100644 --- a/docs/system/removed-features.rst +++ b/docs/system/removed-features.rst @@ -97,6 +97,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.30.2