From 4ad351819b974d724e926fd23cdd66bec3c9768e Mon Sep 17 00:00:00 2001
From: Kevin Wolf
Date: Thu, 19 Apr 2018 17:30:16 +0200
Subject: job: Move single job finalisation to Job

This moves the finalisation of a single job from BlockJob to Job.

Some part of this code depends on job transactions, and job transactions
call this code, we introduce some temporary calls from Job functions to
BlockJob ones. This will be fixed once transactions move to Job, too.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
---
 qemu-img.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'qemu-img.c')

diff --git a/qemu-img.c b/qemu-img.c
index 2ab04b285a..7419ec7a1a 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -871,7 +871,7 @@ static void run_block_job(BlockJob *job, Error **errp)
     if (!job_is_completed(&job->job)) {
         ret = block_job_complete_sync(job, errp);
     } else {
-        ret = job->ret;
+        ret = job->job.ret;
     }
     job_unref(&job->job);
     aio_context_release(aio_context);
-- 
cgit v1.2.3-55-g7522