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/backup.c | |
| parent | c616f16e0c9a2d0b2f13785d37ca0f18d54d571f (diff) | |
| download | qemu-f3e4ce4af336f2ea306fa0f40ec1a5149864ca8c.tar.gz | |
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/backup.c')
| -rw-r--r-- | block/backup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/backup.c b/block/backup.c index 5387fbd84e..9ca1d8ec88 100644 --- a/block/backup.c +++ b/block/backup.c @@ -208,7 +208,7 @@ static void backup_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 void backup_cleanup_sync_bitmap(BackupBlockJob *job, int ret) @@ -359,7 +359,8 @@ static bool coroutine_fn yield_and_check(BackupBlockJob *job) */ if (job->common.speed) { uint64_t delay_ns = ratelimit_calculate_delay(&job->limit, - job->sectors_read); + job->sectors_read * + BDRV_SECTOR_SIZE); job->sectors_read = 0; block_job_sleep_ns(&job->common, QEMU_CLOCK_REALTIME, delay_ns); } else { |