From nobody Mon Feb 9 03:13:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513213679625385.3883450708287; Wed, 13 Dec 2017 17:07:59 -0800 (PST) Received: from localhost ([::1]:38617 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePI09-0006Zq-TA for importer@patchew.org; Wed, 13 Dec 2017 20:07:53 -0500 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 Received: from mx1.redhat.com ([209.132.183.28]:51716) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePHst-000347-5X; Wed, 13 Dec 2017 20:00:23 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A9C880F79; Thu, 14 Dec 2017 01:00:22 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-231.bos.redhat.com [10.18.17.231]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6315017168; Thu, 14 Dec 2017 01:00:21 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org 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> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 14 Dec 2017 01:00:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 7/7] block/backup: use block_job_throttle X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, mreitz@redhat.com, stefanha@redhat.com, John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: John Snow Reviewed-by: Paolo Bonzini Reviewed-by: Stefan Hajnoczi --- 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) =20 static bool coroutine_fn yield_and_check(BackupBlockJob *job) { + uint64_t delay_ns =3D 0; + if (block_job_is_cancelled(&job->common)) { return true; } @@ -342,14 +344,13 @@ static bool coroutine_fn yield_and_check(BackupBlockJ= ob *job) * (without, VM does not reboot) */ if (job->common.speed) { - uint64_t delay_ns =3D ratelimit_calculate_delay(&job->limit, - job->bytes_read); + delay_ns =3D ratelimit_calculate_delay(&job->limit, + job->bytes_read); job->bytes_read =3D 0; - block_job_sleep_ns(&job->common, delay_ns); - } else { - block_job_sleep_ns(&job->common, 0); } =20 + block_job_throttle(&job->common, delay_ns); + if (block_job_is_cancelled(&job->common)) { return true; } --=20 2.14.3