diff options
| author | Eric Blake <eblake@redhat.com> | 2017-07-07 07:44:39 -0500 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2017-07-10 13:18:06 +0200 |
| commit | f3e4ce4af336f2ea306fa0f40ec1a5149864ca8c (patch) | |
| tree | 2e862184064f654be327bb3a4aa12176ca978cdd /block/stream.c | |
| parent | c616f16e0c9a2d0b2f13785d37ca0f18d54d571f (diff) | |
blockjob: Track job ratelimits via bytes, not sectors
The user interface specifies job rate limits in bytes/second.
It's pointless to have our internal representation track things
in sectors/second, particularly since we want to move away from
sector-based interfaces.
Fix up a doc typo found while verifying that the ratelimit
code handles the scaling difference.
Repetition of expressions like 'n * BDRV_SECTOR_SIZE' will be
cleaned up later when functions are converted to iterate over
images by bytes rather than by sectors.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block/stream.c')
| -rw-r--r-- | block/stream.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/stream.c b/block/stream.c index 52d329f5c6..29273a5d23 100644 --- a/block/stream.c +++ b/block/stream.c @@ -191,7 +191,8 @@ static void coroutine_fn stream_run(void *opaque) /* Publish progress */ s->common.offset += n * BDRV_SECTOR_SIZE; if (copy && s->common.speed) { - delay_ns = ratelimit_calculate_delay(&s->limit, n); + delay_ns = ratelimit_calculate_delay(&s->limit, + n * BDRV_SECTOR_SIZE); } } @@ -220,7 +221,7 @@ static void stream_set_speed(BlockJob *job, int64_t speed, Error **errp) error_setg(errp, QERR_INVALID_PARAMETER, "speed"); return; } - ratelimit_set_speed(&s->limit, speed / BDRV_SECTOR_SIZE, SLICE_TIME); + ratelimit_set_speed(&s->limit, speed, SLICE_TIME); } static const BlockJobDriver stream_job_driver = { |