aboutsummaryrefslogtreecommitdiff
path: root/blockjob.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2018-04-25 15:09:58 +0200
committerKevin Wolf <kwolf@redhat.com>2018-05-23 14:30:51 +0200
commitdf956ae2014340bf7de0190edb1d09be55d9eadf (patch)
treeb9a1cf5b69c78c974f5b697189c7c26dae58def6 /blockjob.c
parent5f9a6a08e8f65e01746d2485fc65a3a78e74865f (diff)
downloadqemu-df956ae2014340bf7de0190edb1d09be55d9eadf.zip
qemu-df956ae2014340bf7de0190edb1d09be55d9eadf.tar.gz
qemu-df956ae2014340bf7de0190edb1d09be55d9eadf.tar.bz2
job: Add job_is_ready()
Instead of having a 'bool ready' in BlockJob, add a function that derives its value from the job status. At the same time, this fixes the behaviour to match what the QAPI documentation promises for query-block-job: 'true if the job may be completed'. When the ready flag was introduced in commit ef6dbf1e46e, the flag never had to be reset to match the description because after being ready, the jobs would immediately complete and disappear. Job transactions and manual job finalisation were introduced only later. With these changes, jobs may stay around even after having completed (and they are not ready to be completed a second time), however their patches forgot to reset the ready flag. Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'blockjob.c')
-rw-r--r--blockjob.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/blockjob.c b/blockjob.c
index 3ca009b..38f18e9 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -269,7 +269,7 @@ BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
info->offset = job->offset;
info->speed = job->speed;
info->io_status = job->iostatus;
- info->ready = job->ready;
+ info->ready = job_is_ready(&job->job),
info->status = job->job.status;
info->auto_finalize = job->job.auto_finalize;
info->auto_dismiss = job->job.auto_dismiss;
@@ -436,7 +436,6 @@ void block_job_user_resume(Job *job)
void block_job_event_ready(BlockJob *job)
{
job_state_transition(&job->job, JOB_STATUS_READY);
- job->ready = true;
if (block_job_is_internal(job)) {
return;