Commit 823c6863 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

blockjob: Fix recent BLOCK_JOB_ERROR regression 



Commit 5a2d2cbd screwed up the the value of members device and action,
breaking tests/qemu-iotests/041.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Tested-By: default avatarBenoit Canet <benoit@irqsave.net>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Reviewed-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 518848a2

blockjob.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

qapi/block-core.json

+1 −1
Original line number Diff line number Diff line
@@ -1551,7 +1551,7 @@ 
{ 'event': 'BLOCK_JOB_ERROR',

  'data': { 'device'   : 'str',

            'operation': 'IoOperationType',

            'action'   : 'BlockdevOnError' } }

            'action'   : 'BlockErrorAction' } }



##

# @BLOCK_JOB_READY