qmp-events: move 'BLOCK_JOB_CANCELLED' doc to schema

Signed-off-by: Marc-André Lureau <[email protected]>
Signed-off-by: Markus Armbruster <[email protected]>

diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
index 9b42f407d4193dc9e600ff9bc8407eeafc6b86fd..e00157198518b5783e93208cf4211a1a9cf2dcec 100644 (file)
--- 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 abfa182846a80e90c3bfec075158bf6884dff841..989334ed0cbea839a9f515d8393b97b518e781de 100644 (file)
--- 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',