diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-06-27 19:24:14 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-06-27 20:00:00 +0200 |
| commit | 823c686356e6758bacb46d3a316b841536d6d707 (patch) | |
| tree | e33bb8734d0101adfa50a925294fe78b6cecdd2b | |
| parent | 518848a214ff67bbaea087552a709afde4f88fa5 (diff) | |
| download | qemu-823c686356e6758bacb46d3a316b841536d6d707.tar.gz | |
blockjob: Fix recent BLOCK_JOB_ERROR regression
Commit 5a2d2cb screwed up the the value of members device and action,
breaking tests/qemu-iotests/041.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Tested-By: Benoit Canet <benoit@irqsave.net>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | blockjob.c | 2 | ||||
| -rw-r--r-- | qapi/block-core.json | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/blockjob.c b/blockjob.c index a32c1c8dd7..67a64ea318 100644 --- a/blockjob.c +++ b/blockjob.c @@ -300,7 +300,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 6f41f84c44..ff7224f647 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -1551,7 +1551,7 @@ { 'event': 'BLOCK_JOB_ERROR', 'data': { 'device' : 'str', 'operation': 'IoOperationType', - 'action' : 'BlockdevOnError' } } + 'action' : 'BlockErrorAction' } } ## # @BLOCK_JOB_READY |