[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 07/13] block/backup: use block_job_relax
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 07/13] block/backup: use block_job_relax |
Date: |
Fri, 19 Jan 2018 15:58:41 -0500 |
See two commits back for justification.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
---
block/backup.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index 7b1cdd038a..b4204c0ee4 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -336,6 +336,8 @@ static void backup_complete(BlockJob *job, void *opaque)
static bool coroutine_fn yield_and_check(BackupBlockJob *job)
{
+ uint64_t delay_ns = 0;
+
if (block_job_is_cancelled(&job->common)) {
return true;
}
@@ -344,14 +346,12 @@ static bool coroutine_fn yield_and_check(BackupBlockJob
*job)
* (without, VM does not reboot)
*/
if (job->common.speed) {
- uint64_t delay_ns = ratelimit_calculate_delay(&job->limit,
- job->bytes_read);
+ delay_ns = ratelimit_calculate_delay(&job->limit,
+ job->bytes_read);
job->bytes_read = 0;
- block_job_sleep_ns(&job->common, delay_ns);
- } else {
- block_job_sleep_ns(&job->common, 0);
}
+ block_job_relax(&job->common, delay_ns);
if (block_job_is_cancelled(&job->common)) {
return true;
}
--
2.14.3
- [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 02/13] blockjob: consolidate SLICE_TIME definition, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 03/13] blockjob: create block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 01/13] blockjob: record time of last entrance, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 05/13] block/commit: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 04/13] blockjob: allow block_job_throttle to take delay_ns, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 06/13] block/stream: use block_job_relax, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 07/13] block/backup: use block_job_relax,
John Snow <=
- [Qemu-devel] [PATCH v2 08/13] allow block_job_relax to return -ECANCELED, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 09/13] block/backup: remove yield_and_check, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 10/13] block/mirror: condense cancellation and relax calls, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 12/13] blockjob: privatize block_job_sleep_ns, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 11/13] block/mirror: remove block_job_sleep_ns calls, John Snow, 2018/01/19
- [Qemu-devel] [PATCH v2 13/13] blockjob: remove block_job_pause_point from interface, John Snow, 2018/01/19
- Re: [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, no-reply, 2018/01/19
- Re: [Qemu-devel] [PATCH v2 00/13] blockjob: refactor mirror_throttle, John Snow, 2018/01/30