blockjob: remove unused functions

These public functions are not used anywhere, thus can be dropped.

Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Message-Id: <20220926093214.506243-21-eesposit@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Emanuele Giuseppe Esposito 2022-09-26 05:32:13 -04:00 committed by Kevin Wolf
parent fca26318a0
commit ba6a910052
2 changed files with 14 additions and 33 deletions

View File

@ -56,12 +56,6 @@ BlockJob *block_job_next_locked(BlockJob *bjob)
return job ? container_of(job, BlockJob, job) : NULL; return job ? container_of(job, BlockJob, job) : NULL;
} }
BlockJob *block_job_next(BlockJob *bjob)
{
JOB_LOCK_GUARD();
return block_job_next_locked(bjob);
}
BlockJob *block_job_get_locked(const char *id) BlockJob *block_job_get_locked(const char *id)
{ {
Job *job = job_get_locked(id); Job *job = job_get_locked(id);
@ -308,7 +302,7 @@ bool block_job_set_speed_locked(BlockJob *job, int64_t speed, Error **errp)
return true; return true;
} }
bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp) static bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)
{ {
JOB_LOCK_GUARD(); JOB_LOCK_GUARD();
return block_job_set_speed_locked(job, speed, errp); return block_job_set_speed_locked(job, speed, errp);
@ -357,12 +351,6 @@ BlockJobInfo *block_job_query_locked(BlockJob *job, Error **errp)
return info; return info;
} }
BlockJobInfo *block_job_query(BlockJob *job, Error **errp)
{
JOB_LOCK_GUARD();
return block_job_query_locked(job, errp);
}
/* Called with job lock held */ /* Called with job lock held */
static void block_job_iostatus_set_err_locked(BlockJob *job, int error) static void block_job_iostatus_set_err_locked(BlockJob *job, int error)
{ {
@ -525,7 +513,7 @@ void block_job_iostatus_reset_locked(BlockJob *job)
job->iostatus = BLOCK_DEVICE_IO_STATUS_OK; job->iostatus = BLOCK_DEVICE_IO_STATUS_OK;
} }
void block_job_iostatus_reset(BlockJob *job) static void block_job_iostatus_reset(BlockJob *job)
{ {
JOB_LOCK_GUARD(); JOB_LOCK_GUARD();
block_job_iostatus_reset_locked(job); block_job_iostatus_reset_locked(job);

View File

@ -102,17 +102,15 @@ typedef struct BlockJob {
*/ */
/** /**
* block_job_next: * block_job_next_locked:
* @job: A block job, or %NULL. * @job: A block job, or %NULL.
* *
* Get the next element from the list of block jobs after @job, or the * Get the next element from the list of block jobs after @job, or the
* first one if @job is %NULL. * first one if @job is %NULL.
* *
* Returns the requested job, or %NULL if there are no more jobs left. * Returns the requested job, or %NULL if there are no more jobs left.
* Called with job lock held.
*/ */
BlockJob *block_job_next(BlockJob *job);
/* Same as block_job_next(), but called with job lock held. */
BlockJob *block_job_next_locked(BlockJob *job); BlockJob *block_job_next_locked(BlockJob *job);
/** /**
@ -122,6 +120,7 @@ BlockJob *block_job_next_locked(BlockJob *job);
* Get the block job identified by @id (which must not be %NULL). * Get the block job identified by @id (which must not be %NULL).
* *
* Returns the requested job, or %NULL if it doesn't exist. * Returns the requested job, or %NULL if it doesn't exist.
* Called with job lock *not* held.
*/ */
BlockJob *block_job_get(const char *id); BlockJob *block_job_get(const char *id);
@ -161,43 +160,37 @@ void block_job_remove_all_bdrv(BlockJob *job);
bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs); bool block_job_has_bdrv(BlockJob *job, BlockDriverState *bs);
/** /**
* block_job_set_speed: * block_job_set_speed_locked:
* @job: The job to set the speed for. * @job: The job to set the speed for.
* @speed: The new value * @speed: The new value
* @errp: Error object. * @errp: Error object.
* *
* Set a rate-limiting parameter for the job; the actual meaning may * Set a rate-limiting parameter for the job; the actual meaning may
* vary depending on the job type. * vary depending on the job type.
*/ *
bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp); * Called with job lock held, but might release it temporarily.
/*
* Same as block_job_set_speed(), but called with job lock held.
* Might release the lock temporarily.
*/ */
bool block_job_set_speed_locked(BlockJob *job, int64_t speed, Error **errp); bool block_job_set_speed_locked(BlockJob *job, int64_t speed, Error **errp);
/** /**
* block_job_query: * block_job_query_locked:
* @job: The job to get information about. * @job: The job to get information about.
* *
* Return information about a job. * Return information about a job.
*
* Called with job lock held.
*/ */
BlockJobInfo *block_job_query(BlockJob *job, Error **errp);
/* Same as block_job_query(), but called with job lock held. */
BlockJobInfo *block_job_query_locked(BlockJob *job, Error **errp); BlockJobInfo *block_job_query_locked(BlockJob *job, Error **errp);
/** /**
* block_job_iostatus_reset: * block_job_iostatus_reset_locked:
* @job: The job whose I/O status should be reset. * @job: The job whose I/O status should be reset.
* *
* Reset I/O status on @job and on BlockDriverState objects it uses, * Reset I/O status on @job and on BlockDriverState objects it uses,
* other than job->blk. * other than job->blk.
*
* Called with job lock held.
*/ */
void block_job_iostatus_reset(BlockJob *job);
/* Same as block_job_iostatus_reset(), but called with job lock held. */
void block_job_iostatus_reset_locked(BlockJob *job); void block_job_iostatus_reset_locked(BlockJob *job);
/* /*