summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuiz Capitulino <lcapitulino@redhat.com>2014-09-11 10:25:48 -0400
committerKevin Wolf <kwolf@redhat.com>2014-09-11 17:14:13 +0200
commit624ff5736ef9245bb8070400ccaf65857b6d1c38 (patch)
treec7c92007710a861fc6d8f75f7f17261688ddc558
parent745a9bb9cdcdcc50219d14704477c5cd678c4a7e (diff)
downloadqemu-624ff5736ef9245bb8070400ccaf65857b6d1c38.tar.gz
block: extend BLOCK_IO_ERROR with reason string
BLOCK_IO_ERROR events are logged by libvirt, which helps with post mortem analysis of guests. However, one information that we miss today is a human readable string describing the cause of the I/O error. This commit adds that string it to BLOCK_IO_ERROR. Note that this string is a debugging aid for humans, meaning that it should not parsed by applications. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block.c3
-rw-r--r--qapi/block-core.json7
2 files changed, 8 insertions, 2 deletions
diff --git a/block.c b/block.c
index dda5ae914d..bcd952a4cb 100644
--- a/block.c
+++ b/block.c
@@ -3647,7 +3647,8 @@ static void send_qmp_error_event(BlockDriverState *bs,
ac = is_read ? IO_OPERATION_TYPE_READ : IO_OPERATION_TYPE_WRITE;
qapi_event_send_block_io_error(bdrv_get_device_name(bs), ac, action,
bdrv_iostatus_is_enabled(bs),
- error == ENOSPC, &error_abort);
+ error == ENOSPC, strerror(error),
+ &error_abort);
}
/* This is done by device models because, while the block layer knows
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 68945c26b2..4064d5bf7d 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -1593,6 +1593,10 @@
# io-status is present, please see query-block documentation
# for more information (since: 2.2)
#
+# @reason: human readable string describing the error cause.
+# (This field is a debugging aid for humans, it should not
+# be parsed by applications) (since: 2.2)
+#
# Note: If action is "stop", a STOP event will eventually follow the
# BLOCK_IO_ERROR event
#
@@ -1600,7 +1604,8 @@
##
{ 'event': 'BLOCK_IO_ERROR',
'data': { 'device': 'str', 'operation': 'IoOperationType',
- 'action': 'BlockErrorAction', '*nospace': 'bool' } }
+ 'action': 'BlockErrorAction', '*nospace': 'bool',
+ 'reason': 'str' } }
##
# @BLOCK_JOB_COMPLETED