Commit 518848a2 authored by Markus Armbruster's avatar Markus Armbruster Committed by Kevin Wolf
Browse files

blockjob: Fix recent BLOCK_JOB_READY regression 



Commit bcada37b dropped the (up to now undocumented) members type, len,
offset, speed, breaking tests/qemu-iotests/040 and 041.

Restore and document them.  This fixes 040, and partially fixes 041.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Tested-By: default avatarBenoit Canet <benoit@irqsave.net>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d64c60a7

blockjob.c

+5 −1
Original line number Diff line number Diff line
@@ -270,7 +270,11 @@ void block_job_event_completed(BlockJob *job, const char *msg) 


void block_job_event_ready(BlockJob *job)

{

    qapi_event_send_block_job_ready(bdrv_get_device_name(job->bs), &error_abort);

    qapi_event_send_block_job_ready(job->driver->job_type,

                                    bdrv_get_device_name(job->bs),

                                    job->len,

                                    job->offset,

                                    job->speed, &error_abort);

}



BlockErrorAction block_job_error_action(BlockJob *job, BlockDriverState *bs,

qapi/block-core.json

+14 −1
Original line number Diff line number Diff line
@@ -1558,12 +1558,25 @@ 
#

# Emitted when a block job is ready to complete

#

# @type: job type

#

# @device: device name

#

# @len: maximum progress value

#

# @offset: current progress value. On success this is equal to len.

#          On failure this is less than len

#

# @speed: rate limit, bytes per second

#

# Note: The "ready to complete" status is always reset by a @BLOCK_JOB_ERROR

# event

#

# Since: 1.3

##

{ 'event': 'BLOCK_JOB_READY',

  'data': { 'device': 'str' } }
 
  'data': { 'type'  : 'BlockJobType',

            'device': 'str',

            'len'   : 'int',

            'offset': 'int',

            'speed' : 'int' } }