From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw9hh-0001ha-Dy for qemu-devel@nongnu.org; Tue, 10 Nov 2015 09:15:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zw9hf-0005iS-Nj for qemu-devel@nongnu.org; Tue, 10 Nov 2015 09:15:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47245) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zw9hf-0005iM-BT for qemu-devel@nongnu.org; Tue, 10 Nov 2015 09:15:19 -0500 From: Stefan Hajnoczi Date: Tue, 10 Nov 2015 14:14:11 +0000 Message-Id: <1447164879-6756-17-git-send-email-stefanha@redhat.com> In-Reply-To: <1447164879-6756-1-git-send-email-stefanha@redhat.com> References: <1447164879-6756-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 16/44] blockjob: Add "completed" and "ret" in BlockJob List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: John Snow , Peter Maydell , Fam Zheng , Stefan Hajnoczi From: Fam Zheng 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 --- blockjob.c | 3 +++ include/block/blockjob.h | 9 +++++++++ 2 files changed, 12 insertions(+) diff --git a/blockjob.c b/blockjob.c index ae9c5b2..bcd7efc 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 ed856d7..c70d55a 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; + }; /** -- 2.5.0