From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePHsy-0001cK-J6 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 20:00:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePHsw-00037G-D6 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 20:00:28 -0500 From: John Snow Date: Wed, 13 Dec 2017 19:59:53 -0500 Message-Id: <20171214005953.8898-8-jsnow@redhat.com> In-Reply-To: <20171214005953.8898-1-jsnow@redhat.com> References: <20171214005953.8898-1-jsnow@redhat.com> Subject: [Qemu-devel] [PATCH 7/7] block/backup: use block_job_throttle List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com, mreitz@redhat.com, John Snow Signed-off-by: John Snow --- 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