From dbe5e6c1f73b41282624b78a2375a5c3ee59e905 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Thu, 19 Apr 2018 13:04:01 +0200 Subject: job: Replace BlockJob.completed with job_is_completed() Since we introduced an explicit status to block job, BlockJob.completed is redundant because it can be derived from the status. Remove the field from BlockJob and add a function to derive it from the status at the Job level. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz Reviewed-by: John Snow --- qemu-img.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'qemu-img.c') diff --git a/qemu-img.c b/qemu-img.c index 911456ba40..f3fe903c38 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -866,9 +866,9 @@ static void run_block_job(BlockJob *job, Error **errp) aio_poll(aio_context, true); qemu_progress_print(job->len ? ((float)job->offset / job->len * 100.f) : 0.0f, 0); - } while (!job->ready && !job->completed); + } while (!job->ready && !job_is_completed(&job->job)); - if (!job->completed) { + if (!job_is_completed(&job->job)) { ret = block_job_complete_sync(job, errp); } else { ret = job->ret; -- cgit v1.2.3-55-g7522