diff options
| author | Paolo Bonzini | 2021-06-14 10:11:26 +0200 |
|---|---|---|
| committer | Vladimir Sementsov-Ogievskiy | 2021-06-25 13:22:21 +0200 |
| commit | 720507ed95023e45620f305767d12cd716e8b8ca (patch) | |
| tree | d0c3a997b280da8eab6df328309e993912294ca7 | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210624-pull-request' i... (diff) | |
| download | qemu-720507ed95023e45620f305767d12cd716e8b8ca.tar.gz qemu-720507ed95023e45620f305767d12cd716e8b8ca.tar.xz qemu-720507ed95023e45620f305767d12cd716e8b8ca.zip | |
ratelimit: treat zero speed as unlimited
Both users of RateLimit, block-copy.c and blockjob.c, treat
a speed of zero as unlimited, while RateLimit treats it as
"as slow as possible". The latter is nicer from the code
point of view but pretty useless, so disable rate limiting
if a speed of zero is provided.
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-2-eesposit@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
| -rw-r--r-- | include/qemu/ratelimit.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h index 003ea6d5a3..48bf59e857 100644 --- a/include/qemu/ratelimit.h +++ b/include/qemu/ratelimit.h @@ -43,7 +43,11 @@ static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n) double delay_slices; QEMU_LOCK_GUARD(&limit->lock); - assert(limit->slice_quota && limit->slice_ns); + if (!limit->slice_quota) { + /* Throttling disabled. */ + return 0; + } + assert(limit->slice_ns); if (limit->slice_end_time < now) { /* Previous, possibly extended, time slice finished; reset the @@ -83,7 +87,11 @@ static inline void ratelimit_set_speed(RateLimit *limit, uint64_t speed, { QEMU_LOCK_GUARD(&limit->lock); limit->slice_ns = slice_ns; - limit->slice_quota = MAX(((double)speed * slice_ns) / 1000000000ULL, 1); + if (speed == 0) { + limit->slice_quota = 0; + } else { + limit->slice_quota = MAX(((double)speed * slice_ns) / 1000000000ULL, 1); + } } #endif |