Commit 5a2d2cb screwed up the the value of members device and action, breaking tests/qemu-iotests/041.
Signed-off-by: Markus Armbruster <[email protected]> --- blockjob.c | 2 +- qapi/block-core.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blockjob.c b/blockjob.c index 37a8f1f..4d8ff45 100644 --- a/blockjob.c +++ b/blockjob.c @@ -286,7 +286,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs, default: abort(); } - qapi_event_send_block_job_error(bdrv_get_device_name(bs), + qapi_event_send_block_job_error(bdrv_get_device_name(job->bs), is_read ? IO_OPERATION_TYPE_READ : IO_OPERATION_TYPE_WRITE, action, &error_abort); diff --git a/qapi/block-core.json b/qapi/block-core.json index 8f42f24..c339d05 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1544,7 +1544,7 @@ { 'event': 'BLOCK_JOB_ERROR', 'data': { 'device' : 'str', 'operation': 'IoOperationType', - 'action' : 'BlockdevOnError' } } + 'action' : 'BlockErrorAction' } } ## # @BLOCK_JOB_READY -- 1.9.3
