| Message ID | 1436500012-32593-8-git-send-email-famz@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/09/2015 11:46 PM, Fam Zheng wrote: > They are set when block_job_completed is called. > > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > blockjob.c | 3 +++ > include/block/blockjob.h | 9 +++++++++ > 2 files changed, 12 insertions(+) > > diff --git a/blockjob.c b/blockjob.c > index 62bb906..fb1d9e7 100644 > --- a/blockjob.c > +++ b/blockjob.c > @@ -89,6 +89,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_release(bs); > } > diff --git a/include/block/blockjob.h b/include/block/blockjob.h > index a7b7f66..40d0776 100644 > --- a/include/block/blockjob.h > +++ b/include/block/blockjob.h > @@ -134,6 +134,15 @@ struct BlockJob { > > /** The opaque value that is passed to the completion function. */ > void *opaque; > + > + /* True if this job has reported completion by calling block_job_completed. > + */ The end comment marker looks a little doofy on a newline, no? > + bool completed; > + > + /* ret code passed to block_job_completed. > + */ > + int ret; > + > }; > > /** > Reviewed-by: John Snow <jsnow@redhat.com>
diff --git a/blockjob.c b/blockjob.c index 62bb906..fb1d9e7 100644 --- a/blockjob.c +++ b/blockjob.c @@ -89,6 +89,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_release(bs); } diff --git a/include/block/blockjob.h b/include/block/blockjob.h index a7b7f66..40d0776 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -134,6 +134,15 @@ struct BlockJob { /** The opaque value that is passed to the completion function. */ void *opaque; + + /* True if this job has reported completion by calling block_job_completed. + */ + bool completed; + + /* ret code passed to block_job_completed. + */ + int ret; + }; /**
They are set when block_job_completed is called. Signed-off-by: Fam Zheng <famz@redhat.com> --- blockjob.c | 3 +++ include/block/blockjob.h | 9 +++++++++ 2 files changed, 12 insertions(+)