aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-08-06 14:37:58 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-08-06 14:48:40 +0100
commitf219a536af0f633a63d901c16fcbcb8be1f11753 (patch)
tree0a61a1b3cf9722286420a8e7ae5c208d13c1235d
parentb47e048df2b224eb3c5f18349c1bd4f9722cf00a (diff)
qapi/block-core.json: Fix nbd-server-start docs
Commit eed8b6917832 added some new text to the nbd-server-start documentation in the wrong place. Since this is after the 'Returns:' line it's parsed as if it were part of the documentation of the "Returns:' information. Move it up to join the rest of the "documentation of the type as a whole" doc text. This doesn't look odd in the current HTML rendering, but the new QAPI-to-rST handling will complain about the indent level of the lines not matching up with the 'Returns:' line. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--qapi/block-core.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/qapi/block-core.json b/qapi/block-core.json
index f04bb3f0dd..535b2b2e7b 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -5206,6 +5206,9 @@
# server will present them as named exports; for example, another
# QEMU instance could refer to them as "nbd:HOST:PORT:exportname=NAME".
#
+# Keep this type consistent with the NbdServerOptions type. The only intended
+# difference is using SocketAddressLegacy instead of SocketAddress.
+#
# @addr: Address on which to listen.
# @tls-creds: ID of the TLS credentials object (since 2.6).
# @tls-authz: ID of the QAuthZ authorization object used to validate
@@ -5216,9 +5219,6 @@
#
# Returns: error if the server is already running.
#
-# Keep this type consistent with the NbdServerOptions type. The only intended
-# difference is using SocketAddressLegacy instead of SocketAddress.
-#
# Since: 1.3.0
##
{ 'command': 'nbd-server-start',