From patchwork Fri Jan 19 20:58:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Snow X-Patchwork-Id: 10175993 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7EC33602B1 for ; Fri, 19 Jan 2018 21:04:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75BDB28713 for ; Fri, 19 Jan 2018 21:04:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A90C287A5; Fri, 19 Jan 2018 21:04:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 12F8A28713 for ; Fri, 19 Jan 2018 21:04:07 +0000 (UTC) Received: from localhost ([::1]:44762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecdpW-00061Y-9l for patchwork-qemu-devel@patchwork.kernel.org; Fri, 19 Jan 2018 16:04:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecdkv-0001rM-L9 for qemu-devel@nongnu.org; Fri, 19 Jan 2018 15:59:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecdku-00063l-SQ for qemu-devel@nongnu.org; Fri, 19 Jan 2018 15:59:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52680) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecdks-00062V-N1; Fri, 19 Jan 2018 15:59:18 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C95125A59; Fri, 19 Jan 2018 20:59:17 +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 2D0C95C542; Fri, 19 Jan 2018 20:59:16 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org Date: Fri, 19 Jan 2018 15:58:43 -0500 Message-Id: <20180119205847.7141-10-jsnow@redhat.com> In-Reply-To: <20180119205847.7141-1-jsnow@redhat.com> References: <20180119205847.7141-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 19 Jan 2018 20:59:17 +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 v2 09/13] block/backup: remove yield_and_check 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is a respin of the same functionality as mirror_throttle, so trash this and replace it with the generic version. yield_and_check returned true if canceled, false otherwise. block_job_relax returns -ECANCELED if canceled, 0 otherwise. Signed-off-by: John Snow --- block/backup.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/block/backup.c b/block/backup.c index b4204c0ee4..0624c3b322 100644 --- a/block/backup.c +++ b/block/backup.c @@ -334,29 +334,17 @@ static void backup_complete(BlockJob *job, void *opaque) g_free(data); } -static bool coroutine_fn yield_and_check(BackupBlockJob *job) +static uint64_t get_delay_ns(BackupBlockJob *job) { uint64_t delay_ns = 0; - if (block_job_is_cancelled(&job->common)) { - return true; - } - - /* we need to yield so that bdrv_drain_all() returns. - * (without, VM does not reboot) - */ if (job->common.speed) { delay_ns = ratelimit_calculate_delay(&job->limit, job->bytes_read); job->bytes_read = 0; } - block_job_relax(&job->common, delay_ns); - if (block_job_is_cancelled(&job->common)) { - return true; - } - - return false; + return delay_ns; } static int coroutine_fn backup_run_incremental(BackupBlockJob *job) @@ -369,7 +357,7 @@ static int coroutine_fn backup_run_incremental(BackupBlockJob *job) hbitmap_iter_init(&hbi, job->copy_bitmap, 0); while ((cluster = hbitmap_iter_next(&hbi)) != -1) { do { - if (yield_and_check(job)) { + if (block_job_relax(&job->common, get_delay_ns(job))) { return 0; } ret = backup_do_cow(job, cluster * job->cluster_size, @@ -465,7 +453,7 @@ static void coroutine_fn backup_run(void *opaque) bool error_is_read; int alloced = 0; - if (yield_and_check(job)) { + if (block_job_relax(&job->common, get_delay_ns(job))) { break; }