openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

blockjob: Add "ready" field 

When a block job signals readiness, this is currently reported only
through QMP. If qemu wants to use block jobs for internal tasks, there
needs to be another way to correctly detect when a block job may be
completed.

For this reason, introduce a bool "ready" which is set when the block
job may be completed.

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-id: 1414159063-25977-6-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Max Reitz 2014-10-24 15:57:34 +02:00 committed by Stefan Hajnoczi
parent 345f9e1b04
commit ef6dbf1e46
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
blockjob.c
View File

@ -261,6 +261,7 @@ BlockJobInfo *block_job_query(BlockJob *job)
info->offset = job->offset; info->offset = job->offset;
info->speed = job->speed; info->speed = job->speed;
info->io_status = job->iostatus; info->io_status = job->iostatus;
info->ready = job->ready;
return info; return info;
} }
@ -296,6 +297,8 @@ void block_job_event_completed(BlockJob *job, const char *msg)
void block_job_event_ready(BlockJob *job) void block_job_event_ready(BlockJob *job)
{ {
job->ready = true;
qapi_event_send_block_job_ready(job->driver->job_type, qapi_event_send_block_job_ready(job->driver->job_type,
bdrv_get_device_name(job->bs), bdrv_get_device_name(job->bs),
job->len, job->len,

5
include/block/blockjob.h
View File

@ -91,6 +91,11 @@ struct BlockJob {
*/ */
bool busy; bool busy;
/**
* Set to true when the job is ready to be completed.
*/
bool ready;
/** Status that is published by the query-block-jobs QMP API */ /** Status that is published by the query-block-jobs QMP API */
BlockDeviceIoStatus iostatus; BlockDeviceIoStatus iostatus;

4
qapi/block-core.json
View File

@ -514,12 +514,14 @@
# #
# @io-status: the status of the job (since 1.3) # @io-status: the status of the job (since 1.3)
# #
# @ready: true if the job may be completed (since 2.2)
#
# Since: 1.1 # Since: 1.1
## ##
{ 'type': 'BlockJobInfo', { 'type': 'BlockJobInfo',
'data': {'type': 'str', 'device': 'str', 'len': 'int', 'data': {'type': 'str', 'device': 'str', 'len': 'int',
'offset': 'int', 'busy': 'bool', 'paused': 'bool', 'speed': 'int', 'offset': 'int', 'busy': 'bool', 'paused': 'bool', 'speed': 'int',
'io-status': 'BlockDeviceIoStatus'} } 'io-status': 'BlockDeviceIoStatus', 'ready': 'bool'} }
## ##
# @query-block-jobs: # @query-block-jobs: