diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2017-05-08 16:13:10 +0200 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2017-05-24 16:38:51 -0400 |
| commit | eb05e011e248c6fb6baee295e14fd206e136028c (patch) | |
| tree | ab38894e8cee57f1e1d2ca690b74bc00800673cb /include/block | |
| parent | 4fb588e95bacb770746cc794ef165fd71a4d27ea (diff) | |
| download | qemu-eb05e011e248c6fb6baee295e14fd206e136028c.tar.gz | |
blockjob: use deferred_to_main_loop to indicate the coroutine has ended
All block jobs are using block_job_defer_to_main_loop as the final
step just before the coroutine terminates. At this point,
block_job_enter should do nothing, but currently it restarts
the freed coroutine.
Now, the job->co states should probably be changed to an enum
(e.g. BEFORE_START, STARTED, YIELDED, COMPLETED) subsuming
block_job_started, job->deferred_to_main_loop and job->busy.
For now, this patch eliminates the problematic reenter by
removing the reset of job->deferred_to_main_loop (which served
no purpose, as far as I could see) and checking the flag in
block_job_enter.
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20170508141310.8674-12-pbonzini@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/blockjob_int.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index 4f2d2ac75a..f13ad05c0d 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -241,7 +241,8 @@ typedef void BlockJobDeferToMainLoopFn(BlockJob *job, void *opaque); * @fn: The function to run in the main loop * @opaque: The opaque value that is passed to @fn * - * Execute a given function in the main loop with the BlockDriverState + * This function must be called by the main job coroutine just before it + * returns. @fn is executed in the main loop with the BlockDriverState * AioContext acquired. Block jobs must call bdrv_unref(), bdrv_close(), and * anything that uses bdrv_drain_all() in the main loop. * |