aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-23 10:15:59 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-01-16 09:15:26 +0100
commit4f19a01b3e066b56bf22d83ff12d840c9a213dff (patch)
treede268c44865d0fb4b0607598313821731d9f1923
parenta4143a845a6d4b078b34aa3c750566cfdea6192a (diff)
qmp-commands: move 'ringbuf-read' doc to schema
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rw-r--r--docs/qmp-commands.txt27
-rw-r--r--qapi-schema.json9
2 files changed, 9 insertions, 27 deletions
diff --git a/docs/qmp-commands.txt b/docs/qmp-commands.txt
index c22c6f11ca..817cc5a721 100644
--- a/docs/qmp-commands.txt
+++ b/docs/qmp-commands.txt
@@ -334,33 +334,6 @@ Example:
Note: inject-nmi fails when the guest doesn't support injecting.
-ringbuf-read
--------------
-
-Read from a ring buffer character device.
-
-Arguments:
-
-- "device": ring buffer character device name (json-string)
-- "size": how many bytes to read at most (json-int)
- - Number of data bytes, not number of characters in encoded data
-- "format": data format (json-string, optional)
- - Possible values: "utf8" (default), "base64"
- - Naturally, format "utf8" works only when the ring buffer
- contains valid UTF-8 text. Invalid UTF-8 sequences get
- replaced. Bug: replacement doesn't work. Bug: can screw
- up on encountering NUL characters, after the ring buffer
- lost data, and when reading stops because the size limit
- is reached.
-
-Example:
-
--> { "execute": "ringbuf-read",
- "arguments": { "device": "foo",
- "size": 1000,
- "format": "utf8" } }
-<- {"return": "abcdefgh"}
-
xen-save-devices-state
-------
diff --git a/qapi-schema.json b/qapi-schema.json
index cff9ae25ed..dfd3299774 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -446,6 +446,15 @@
# Returns: data read from the device
#
# Since: 1.4
+#
+# Example:
+#
+# -> { "execute": "ringbuf-read",
+# "arguments": { "device": "foo",
+# "size": 1000,
+# "format": "utf8" } }
+# <- { "return": "abcdefgh" }
+#
##
{ 'command': 'ringbuf-read',
'data': {'device': 'str', 'size': 'int', '*format': 'DataFormat'},