From a689dbf2df74a55d43e3fc4d6aec30ed67ca998f Mon Sep 17 00:00:00 2001 From: Fam Zheng Date: Thu, 5 Nov 2015 18:13:13 -0500 Subject: [PATCH] blockjob: Add "completed" and "ret" in BlockJob They are set when block_job_completed is called. Signed-off-by: Fam Zheng Reviewed-by: John Snow Reviewed-by: Max Reitz Signed-off-by: John Snow Message-id: 1446765200-3054-8-git-send-email-jsnow@redhat.com Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- blockjob.c | 3 +++ include/block/blockjob.h | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/blockjob.c b/blockjob.c index ae9c5b2925..bcd7efcb64 100644 --- a/blockjob.c +++ b/blockjob.c @@ -99,6 +99,9 @@ void block_job_completed(BlockJob *job, int ret) BlockDriverState *bs = job->bs; assert(bs->job == job); + assert(!job->completed); + job->completed = true; + job->ret = ret; job->cb(job->opaque, ret); block_job_unref(job); } diff --git a/include/block/blockjob.h b/include/block/blockjob.h index ed856d72bf..c70d55a644 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -153,6 +153,15 @@ struct BlockJob { /** Reference count of the block job */ int refcnt; + + /* True if this job has reported completion by calling block_job_completed. + */ + bool completed; + + /* ret code passed to block_job_completed. + */ + int ret; + }; /**