From 443127e81b9b83c402dc510910cc6841e1039e37 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Thu, 24 Sep 2020 17:27:13 +0200 Subject: [PATCH] nbd: Deprecate nbd-server-add/remove These QMP commands are replaced by block-export-add/del. Signed-off-by: Kevin Wolf Message-Id: <20200924152717.287415-28-kwolf@redhat.com> Acked-by: Stefan Hajnoczi Reviewed-by: Max Reitz Signed-off-by: Kevin Wolf --- docs/system/deprecated.rst | 6 ++++++ qapi/block-export.json | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index da862201ba..5e8346f7bf 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 3ce4d6276b..65804834d9 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: -- 2.30.2