From: John Snow <jsnow@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org,
stefanha@redhat.com, mreitz@redhat.com,
John Snow <jsnow@redhat.com>
Subject: [Qemu-devel] [PATCH 7/7] block/backup: use block_job_throttle
Date: Wed, 13 Dec 2017 19:59:53 -0500 [thread overview]
Message-ID: <20171214005953.8898-8-jsnow@redhat.com> (raw)
In-Reply-To: <20171214005953.8898-1-jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
block/backup.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/block/backup.c b/block/backup.c
index d71b25c017..a5ede5f643 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -334,6 +334,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;
}
@@ -342,14 +344,13 @@ 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_throttle(&job->common, delay_ns);
+
if (block_job_is_cancelled(&job->common)) {
return true;
}
--
2.14.3
next prev parent reply other threads:[~2017-12-14 1:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-14 0:59 [Qemu-devel] [PATCH 0/7] blockjob: refactor mirror_throttle John Snow
2017-12-14 0:59 ` [Qemu-devel] [PATCH 1/7] blockjob: record time of last yield John Snow
2017-12-14 8:38 ` Paolo Bonzini
2017-12-14 15:55 ` John Snow
2017-12-18 14:22 ` Stefan Hajnoczi
2017-12-14 0:59 ` [Qemu-devel] [PATCH 2/7] blockjob: consolidate SLICE_TIME definition John Snow
2017-12-14 8:51 ` Paolo Bonzini
2017-12-18 14:23 ` Stefan Hajnoczi
2018-01-02 20:29 ` Jeff Cody
2017-12-14 0:59 ` [Qemu-devel] [PATCH 3/7] blockjob: create block_job_throttle John Snow
2017-12-14 8:39 ` Paolo Bonzini
2017-12-14 15:57 ` John Snow
2017-12-18 14:27 ` Stefan Hajnoczi
2018-01-02 21:23 ` Jeff Cody
2017-12-14 0:59 ` [Qemu-devel] [PATCH 4/7] blockjob: allow block_job_throttle to take delay_ns John Snow
2017-12-14 8:49 ` Paolo Bonzini
2017-12-14 16:06 ` John Snow
2017-12-14 17:21 ` Paolo Bonzini
2017-12-14 17:22 ` John Snow
2017-12-14 17:23 ` Paolo Bonzini
2017-12-14 0:59 ` [Qemu-devel] [PATCH 5/7] block/commit: use block_job_throttle John Snow
2017-12-14 8:50 ` Paolo Bonzini
2017-12-18 14:29 ` Stefan Hajnoczi
2017-12-14 0:59 ` [Qemu-devel] [PATCH 6/7] block/stream: " John Snow
2017-12-14 8:50 ` Paolo Bonzini
2017-12-18 14:29 ` Stefan Hajnoczi
2017-12-14 0:59 ` John Snow [this message]
2017-12-14 8:50 ` [Qemu-devel] [PATCH 7/7] block/backup: " Paolo Bonzini
2017-12-18 14:29 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171214005953.8898-8-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).