From e161df3939fd725b67d660e793e1538860c156fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 23 Jun 2016 15:53:50 +0200 Subject: [PATCH] qmp-events: move 'BLOCK_JOB_CANCELLED' doc to schema MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau Signed-off-by: Markus Armbruster --- docs/qmp-events.txt | 25 ------------------------- qapi/block-core.json | 9 +++++++++ 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',