From af0e09106c57e732234eaf9bea5973437b3711d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 23 Jun 2016 15:54:20 +0200 Subject: [PATCH] qmp-events: move 'BLOCK_JOB_ERROR' 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 | 23 ----------------------- qapi/block-core.json | 9 +++++++++ 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt index e001571985..bc831bf365 100644 --- a/docs/qmp-events.txt +++ b/docs/qmp-events.txt @@ -30,29 +30,6 @@ Example: Note: this event is rate-limited. -BLOCK_JOB_ERROR ---------------- - -Emitted when a block job encounters an error. - -Data: - -- "device": Job identifier. Originally the device name but other - values are allowed since QEMU 2.7 (json-string) -- "operation": I/O operation (json-string, "read" or "write") -- "action": action that has been taken, it's one of the following (json-string): - "ignore": error has been ignored, the job may fail later - "report": error will be reported and the job canceled - "stop": error caused job to be paused - -Example: - -{ "event": "BLOCK_JOB_ERROR", - "data": { "device": "ide0-hd1", - "operation": "write", - "action": "stop" }, - "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } - BLOCK_JOB_READY --------------- diff --git a/qapi/block-core.json b/qapi/block-core.json index 989334ed0c..7af44c8d4a 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -3374,6 +3374,15 @@ # @action: action that has been taken # # Since: 1.3 +# +# Example: +# +# <- { "event": "BLOCK_JOB_ERROR", +# "data": { "device": "ide0-hd1", +# "operation": "write", +# "action": "stop" }, +# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } } +# ## { 'event': 'BLOCK_JOB_ERROR', 'data': { 'device' : 'str',