diff options
| author | Vladimir Sementsov-Ogievskiy | 2019-08-29 11:09:53 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2019-09-10 08:58:43 +0200 |
| commit | bb0c94099382b52734a4a4f3c060e90c9a2ac6cf (patch) | |
| tree | ac02b2959676479a50414ee2144fc433681526b1 /include/block | |
| parent | qcow2: Fix the calculation of the maximum L2 cache size (diff) | |
| download | qemu-bb0c94099382b52734a4a4f3c060e90c9a2ac6cf.tar.gz qemu-bb0c94099382b52734a4a4f3c060e90c9a2ac6cf.tar.xz qemu-bb0c94099382b52734a4a4f3c060e90c9a2ac6cf.zip | |
job: drop job_drain
In job_finish_sync job_enter should be enough for a job to make some
progress and draining is a wrong tool for it. So use job_enter directly
here and drop job_drain with all related staff not used more.
Suggested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Tested-by: John Snow <jsnow@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'include/block')
| -rw-r--r-- | include/block/blockjob_int.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index e4a318dd15..e2824a36a8 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -52,17 +52,6 @@ struct BlockJobDriver { * besides job->blk to the new AioContext. */ void (*attached_aio_context)(BlockJob *job, AioContext *new_context); - - /* - * If the callback is not NULL, it will be invoked when the job has to be - * synchronously cancelled or completed; it should drain BlockDriverStates - * as required to ensure progress. - * - * Block jobs must use the default implementation for job_driver.drain, - * which will in turn call this callback after doing generic block job - * stuff. - */ - void (*drain)(BlockJob *job); }; /** @@ -108,14 +97,6 @@ void block_job_free(Job *job); void block_job_user_resume(Job *job); /** - * block_job_drain: - * Callback to be used for JobDriver.drain in all block jobs. Drains the main - * block node associated with the block jobs and calls BlockJobDriver.drain for - * job-specific actions. - */ -void block_job_drain(Job *job); - -/** * block_job_ratelimit_get_delay: * * Calculate and return delay for the next request in ns. See the documentation |