aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc-André Lureau <marcandre.lureau@redhat.com>2016-06-23 15:52:10 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-01-16 09:19:48 +0100
commit07c9f583d50ba68bd19dc2a66236d43c638f1f03 (patch)
tree5083bd1a96dfec15a58c9b4cd624e7756e6c95ff
parent370d4eba7de41e23d84ed617371b45f2db92d68d (diff)
qmp-events: move 'BLOCK_IO_ERROR' 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.txt31
-rw-r--r--qapi/block-core.json13
2 files changed, 13 insertions, 31 deletions
diff --git a/docs/qmp-events.txt b/docs/qmp-events.txt
index f3ea933f87..dc5bce111b 100644
--- a/docs/qmp-events.txt
+++ b/docs/qmp-events.txt
@@ -30,37 +30,6 @@ Example:
Note: this event is rate-limited.
-BLOCK_IO_ERROR
---------------
-
-Emitted when a disk I/O error occurs.
-
-Data:
-
-- "device": device name. This is always present for compatibility
- reasons, but it can be empty ("") if the image does not
- have a device name associated. (json-string)
-- "node-name": node name. Note that errors may be reported for the root node
- that is directly attached to a guest device rather than for the
- node where the error occurred. (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
- "report": error has been reported to the device
- "stop": the VM is going to stop because of the error
-
-Example:
-
-{ "event": "BLOCK_IO_ERROR",
- "data": { "device": "ide0-hd1",
- "node-name": "#block212",
- "operation": "write",
- "action": "stop" },
- "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
-
-Note: If action is "stop", a STOP event will eventually follow the
-BLOCK_IO_ERROR event.
-
BLOCK_JOB_CANCELLED
-------------------
diff --git a/qapi/block-core.json b/qapi/block-core.json
index cfae11f54c..89af577625 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3218,6 +3218,9 @@
# event and must be repaired (Since 2.2; before, every
# BLOCK_IMAGE_CORRUPTED event was fatal)
#
+# Note: If action is "stop", a STOP event will eventually follow the
+# BLOCK_IO_ERROR event.
+#
# Example:
#
# <- { "event": "BLOCK_IMAGE_CORRUPTED",
@@ -3266,6 +3269,16 @@
# BLOCK_IO_ERROR event
#
# Since: 0.13.0
+#
+# Example:
+#
+# <- { "event": "BLOCK_IO_ERROR",
+# "data": { "device": "ide0-hd1",
+# "node-name": "#block212",
+# "operation": "write",
+# "action": "stop" },
+# "timestamp": { "seconds": 1265044230, "microseconds": 450486 } }
+#
##
{ 'event': 'BLOCK_IO_ERROR',
'data': { 'device': 'str', 'node-name': 'str', 'operation': 'IoOperationType',