david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blockjob: Fix recent BLOCK_JOB_ERROR regression

Browse Source 
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>
This commit is contained in:
Markus Armbruster 2014-06-27 19:24:14 +02:00 committed by Kevin Wolf
parent 518848a214
commit 823c686356
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blockjob.c
View File

@ -300,7 +300,7 @@ BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,
default: default:
abort(); 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 : is_read ? IO_OPERATION_TYPE_READ :
IO_OPERATION_TYPE_WRITE, IO_OPERATION_TYPE_WRITE,
action, &error_abort); action, &error_abort);

2
qapi/block-core.json
View File

@ -1551,7 +1551,7 @@
{ 'event': 'BLOCK_JOB_ERROR', { 'event': 'BLOCK_JOB_ERROR',
'data': { 'device' : 'str', 'data': { 'device' : 'str',
'operation': 'IoOperationType', 'operation': 'IoOperationType',
'action' : 'BlockdevOnError' } } 'action' : 'BlockErrorAction' } }
## ##
# @BLOCK_JOB_READY # @BLOCK_JOB_READY