They are the same as fds and vhostfds, except they accept only one fd. Let's deprecate redundant options.
Signed-off-by: Vladimir Sementsov-Ogievskiy <[email protected]> --- Hi all! after "[PATCH v2 00/12] net: refactoring and fixes" options fd and vhostfd becomes redundant, fds and vhostfds may be used instead. this patch also based on "[PATCH v6] qapi: net: deprecate vhostforce option", that's why it's sent separately. Based-on: <[email protected]> Based-on: <[email protected]> docs/about/deprecated.rst | 6 ++++++ qapi/net.json | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e8ff478583..9010f8ab07 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -451,6 +451,12 @@ TAP ``vhostforce`` (since 11.0) The ``vhostforce`` option is redundant with the ``vhost`` option. If they conflict, ``vhost`` takes precedence. Just use ``vhost``. +TAP ``fd`` and ``vhostfd`` (since 11.0) +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Use ``fds`` and ``vhostfds`` correspondingly, each set with one fd +instead of ``fd`` and ``vhsotfd``. + Vhost-user ``vhostforce`` (since 11.0) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/qapi/net.json b/qapi/net.json index 9a00d578e9..2d5aed3ef8 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -326,8 +326,7 @@ # # @fd: file descriptor of an already opened tap # -# @fds: multiple file descriptors of already opened multiqueue capable -# tap +# @fds: multiple file descriptors of already opened tap # # @script: script to initialize the interface # @@ -359,13 +358,15 @@ # Features: # # @deprecated: Member @vhostforce is deprecated. Use @vhost instead. +# Member @fd is deprecated. Use @fds instead. +# Member @vhostfd is deprecated. Use @vhostfds instead. # # Since: 1.2 ## { 'struct': 'NetdevTapOptions', 'data': { '*ifname': 'str', - '*fd': 'str', + '*fd': { 'type': 'str', 'features': [ 'deprecated' ] }, '*fds': 'str', '*script': 'str', '*downscript': 'str', @@ -374,7 +375,7 @@ '*sndbuf': 'size', '*vnet_hdr': 'bool', '*vhost': 'bool', - '*vhostfd': 'str', + '*vhostfd': { 'type': 'str', 'features': [ 'deprecated' ] }, '*vhostfds': 'str', '*vhostforce': { 'type': 'bool', 'features': [ 'deprecated' ] }, '*queues': 'uint32', -- 2.52.0
