Skip to content

Commit

Permalink
blockjob: let ratelimit handle a speed of 0
Browse files Browse the repository at this point in the history
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Message-Id: <20210614081130.22134-4-eesposit@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
  • Loading branch information
bonzini authored and Vladimir Sementsov-Ogievskiy committed Jun 25, 2021
1 parent ca657c9 commit c02b83e
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions blockjob.c
Expand Up @@ -300,10 +300,6 @@ bool block_job_set_speed(BlockJob *job, int64_t speed, Error **errp)

int64_t block_job_ratelimit_get_delay(BlockJob *job, uint64_t n)
{
if (!job->speed) {
return 0;
}

return ratelimit_calculate_delay(&job->limit, n);
}

Expand Down Expand Up @@ -472,12 +468,9 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
blk_set_disable_request_queuing(blk, true);
blk_set_allow_aio_context_change(blk, true);

/* Only set speed when necessary to avoid NotSupported error */
if (speed != 0) {
if (!block_job_set_speed(job, speed, errp)) {
job_early_fail(&job->job);
return NULL;
}
if (!block_job_set_speed(job, speed, errp)) {
job_early_fail(&job->job);
return NULL;
}

return job;
Expand Down

0 comments on commit c02b83e

Please sign in to comment.