[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/13] chardev: reject use of 'wait' flag for socket client charde
From: |
Daniel P . Berrangé |
Subject: |
[PULL 07/13] chardev: reject use of 'wait' flag for socket client chardevs |
Date: |
Thu, 18 Mar 2021 09:25:06 +0000 |
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>
---
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 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
-------------------------------------
--
2.30.2
- [PULL v2 00/13] misc patches removing deprecated features, Daniel P . Berrangé, 2021/03/18
- [PULL 01/13] ui, monitor: remove deprecated VNC ACL option and HMP commands, Daniel P . Berrangé, 2021/03/18
- [PULL 02/13] monitor: raise error when 'pretty' option is used with HMP, Daniel P . Berrangé, 2021/03/18
- [PULL 03/13] monitor: remove 'query-events' QMP command, Daniel P . Berrangé, 2021/03/18
- [PULL 04/13] migrate: remove QMP/HMP commands for speed, downtime and cache size, Daniel P . Berrangé, 2021/03/18
- [PULL 05/13] machine: remove 'query-cpus' QMP command, Daniel P . Berrangé, 2021/03/18
- [PULL 06/13] machine: remove 'arch' field from 'query-cpus-fast' QMP command, Daniel P . Berrangé, 2021/03/18
- [PULL 07/13] chardev: reject use of 'wait' flag for socket client chardevs,
Daniel P . Berrangé <=
- [PULL 08/13] hw/ide: remove 'ide-drive' device, Daniel P . Berrangé, 2021/03/18
- [PULL 09/13] hw/scsi: remove 'scsi-disk' device, Daniel P . Berrangé, 2021/03/18
- [PULL 10/13] block: remove 'encryption_key_missing' flag from QAPI, Daniel P . Berrangé, 2021/03/18
- [PULL 11/13] block: remove dirty bitmaps 'status' field, Daniel P . Berrangé, 2021/03/18
- [PULL 12/13] block: remove 'dirty-bitmaps' field from 'BlockInfo' struct, Daniel P . Berrangé, 2021/03/18
- [PULL 13/13] block: remove support for using "file" driver with block/char devices, Daniel P . Berrangé, 2021/03/18
- Re: [PULL v2 00/13] misc patches removing deprecated features, Peter Maydell, 2021/03/18
- Re: [PULL v2 00/13] misc patches removing deprecated features, Peter Maydell, 2021/03/22