aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-23 15:53:50 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-01-16 09:19:48 +0100
commite161df3939fd725b67d660e793e1538860c156fe (patch)
tree32c09a1266edc00f78f413d5a1d3407572897684
parente21e65b212612083439a68f18b44e373aa38de00 (diff)
qmp-events: move 'BLOCK_JOB_CANCELLED' 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-events.txt25
-rw-r--r--qapi/block-core.json9
2 files changed, 9 insertions, 25 deletions
diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
index 9b42f407d4..e001571985 100644
--- a/docs/qmp-events.txt
+++ b/docs/qmp-events.txt
@@ -30,31 +30,6 @@ Example:
Note: this event is rate-limited.
-BLOCK_JOB_CANCELLED
--------------------
-
-Emitted when a block job has been cancelled.
-
-Data:
-
-- "type": Job type (json-string; "stream" for image streaming
- "commit" for block commit)
-- "device": Job identifier. Originally the device name but other
- values are allowed since QEMU 2.7 (json-string)
-- "len": Maximum progress value (json-int)
-- "offset": Current progress value (json-int)
- On success this is equal to len.
- On failure this is less than len.
-- "speed": Rate limit, bytes per second (json-int)
-
-Example:
-
-{ "event": "BLOCK_JOB_CANCELLED",
- "data": { "type": "stream", "device": "virtio-disk0",
- "len": 10737418240, "offset": 134217728,
- "speed": 0 },
- "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
-
BLOCK_JOB_ERROR
---------------
diff --git a/qapi/block-core.json b/qapi/block-core.json
index abfa182846..989334ed0c 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3344,6 +3344,15 @@
# @speed: rate limit, bytes per second
#
# Since: 1.1
+#
+# Example:
+#
+# <- { "event": "BLOCK_JOB_CANCELLED",
+# "data": { "type": "stream", "device": "virtio-disk0",
+# "len": 10737418240, "offset": 134217728,
+# "speed": 0 },
+# "timestamp": { "seconds": 1267061043, "microseconds": 959568 } }
+#
##
{ 'event': 'BLOCK_JOB_CANCELLED',
'data': { 'type' : 'BlockJobType',