aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2020-09-24 17:27:13 +0200
committerKevin Wolf <kwolf@redhat.com>2020-10-02 15:46:40 +0200
commit443127e81b9b83c402dc510910cc6841e1039e37 (patch)
tree98f14f05e9488729556b4ee6831679ec75a3ccbd
parent5b1cb49704551cff8913032b22c9d6566d217cbb (diff)
downloadqemu-443127e81b9b83c402dc510910cc6841e1039e37.zip
qemu-443127e81b9b83c402dc510910cc6841e1039e37.tar.gz
qemu-443127e81b9b83c402dc510910cc6841e1039e37.tar.bz2
nbd: Deprecate nbd-server-add/remove
These QMP commands are replaced by block-export-add/del. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20200924152717.287415-28-kwolf@redhat.com> Acked-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--docs/system/deprecated.rst6
-rw-r--r--qapi/block-export.json11
2 files changed, 15 insertions, 2 deletions
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst
index da86220..5e8346f 100644
--- a/docs/system/deprecated.rst
+++ b/docs/system/deprecated.rst
@@ -264,6 +264,12 @@ 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)
+''''''''''''''''''''''''''''''''''''''''''''''''''''''''
+
+Use the more generic commands ``block-export-add`` and ``block-export-del``
+instead.
+
Human Monitor Protocol (HMP) commands
-------------------------------------
diff --git a/qapi/block-export.json b/qapi/block-export.json
index 3ce4d62..6580483 100644
--- a/qapi/block-export.json
+++ b/qapi/block-export.json
@@ -108,13 +108,16 @@
#
# The export name will be used as the id for the resulting block export.
#
+# Features:
+# @deprecated: This command is deprecated. Use @block-export-add instead.
+#
# Returns: error if the server is not running, or export with the same name
# already exists.
#
# Since: 1.3.0
##
{ 'command': 'nbd-server-add',
- 'data': 'NbdServerAddOptions', 'boxed': true }
+ 'data': 'NbdServerAddOptions', 'boxed': true, 'features': ['deprecated'] }
##
# @BlockExportRemoveMode:
@@ -147,6 +150,9 @@
# @mode: Mode of command operation. See @BlockExportRemoveMode description.
# Default is 'safe'.
#
+# Features:
+# @deprecated: This command is deprecated. Use @block-export-del instead.
+#
# Returns: error if
# - the server is not running
# - export is not found
@@ -155,7 +161,8 @@
# Since: 2.12
##
{ 'command': 'nbd-server-remove',
- 'data': {'name': 'str', '*mode': 'BlockExportRemoveMode'} }
+ 'data': {'name': 'str', '*mode': 'BlockExportRemoveMode'},
+ 'features': ['deprecated'] }
##
# @nbd-server-stop: