From 3453d97243c72988c89a0105fa9546890eae7bd4 Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 23 Apr 2018 12:24:16 +0200 Subject: job: Move .complete callback to Job This moves the .complete callback that tells a READY job to complete from BlockJobDriver to JobDriver. The wrapper function job_complete() doesn't require anything block job specific any more and can be moved to Job. Signed-off-by: Kevin Wolf Reviewed-by: Max Reitz --- include/block/blockjob.h | 10 ---------- include/block/blockjob_int.h | 6 ------ 2 files changed, 16 deletions(-) (limited to 'include/block') diff --git a/include/block/blockjob.h b/include/block/blockjob.h index d975efea20..85ce18a381 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -153,16 +153,6 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp); */ void block_job_cancel(BlockJob *job, bool force); -/** - * block_job_complete: - * @job: The job to be completed. - * @errp: Error object. - * - * Asynchronously complete the specified job. - */ -void block_job_complete(BlockJob *job, Error **errp); - - /** * block_job_finalize: * @job: The job to fully commit and finish. diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index 38fe22d7e0..b8ca7bb0c9 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -38,12 +38,6 @@ struct BlockJobDriver { /** Generic JobDriver callbacks and settings */ JobDriver job_driver; - /** - * Optional callback for job types whose completion must be triggered - * manually. - */ - void (*complete)(BlockJob *job, Error **errp); - /** * If the callback is not NULL, prepare will be invoked when all the jobs * belonging to the same transaction complete; or upon this job's completion -- cgit v1.2.3-55-g7522