From nobody Sun Feb 8 14:35:04 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 1516396079702248.47614368014422; Fri, 19 Jan 2018 13:07:59 -0800 (PST) Received: from localhost ([::1]:44796 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecdtG-0000JZ-Tb for importer@patchew.org; Fri, 19 Jan 2018 16:07:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46598) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ecdl3-0001zK-Ig for qemu-devel@nongnu.org; Fri, 19 Jan 2018 15:59:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ecdl2-00066l-KK for qemu-devel@nongnu.org; Fri, 19 Jan 2018 15:59:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59942) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ecdky-00064n-Oi; Fri, 19 Jan 2018 15:59:24 -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 D08E84E334; Fri, 19 Jan 2018 20:59:23 +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 101485C1B7; Fri, 19 Jan 2018 20:59:21 +0000 (UTC) From: John Snow To: qemu-block@nongnu.org Date: Fri, 19 Jan 2018 15:58:46 -0500 Message-Id: <20180119205847.7141-13-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.38]); Fri, 19 Jan 2018 20:59:23 +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 12/13] blockjob: privatize block_job_sleep_ns 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" There's not currently any external caller of it. Except in tests, but we'll fix that here too. Replace usages in test cases with block_job_relax, which functions similarly enough to be used as a drop-in replacement. Very technically block_job_sleep_ns(job, 0) behaves differently from block_job_relax(job, 0) in that relax may resolve to a no-op, but this makes no difference in the test in which it is used. Signed-off-by: John Snow Reviewed-by: Max Reitz --- blockjob.c | 11 ++++++++++- include/block/blockjob_int.h | 11 ----------- tests/test-bdrv-drain.c | 2 +- tests/test-blockjob-txn.c | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/blockjob.c b/blockjob.c index b5a0cda412..40167d6896 100644 --- a/blockjob.c +++ b/blockjob.c @@ -876,7 +876,16 @@ bool block_job_is_cancelled(BlockJob *job) return job->cancelled; } =20 -int block_job_sleep_ns(BlockJob *job, int64_t ns) +/** + * block_job_sleep_ns: + * @job: The job that calls the function. + * @ns: How many nanoseconds to stop for. + * + * Put the job to sleep (assuming that it wasn't canceled) for @ns + * %QEMU_CLOCK_REALTIME nanoseconds. Canceling the job will immediately + * interrupt the wait. + */ +static int block_job_sleep_ns(BlockJob *job, int64_t ns) { assert(job->busy); =20 diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index 1ceb47e1e6..c4891a5a9b 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -138,17 +138,6 @@ void *block_job_create(const char *job_id, const Block= JobDriver *driver, uint64_t shared_perm, int64_t speed, int flags, BlockCompletionFunc *cb, void *opaque, Error **errp= ); =20 -/** - * block_job_sleep_ns: - * @job: The job that calls the function. - * @ns: How many nanoseconds to stop for. - * - * Put the job to sleep (assuming that it wasn't canceled) for @ns - * %QEMU_CLOCK_REALTIME nanoseconds. Canceling the job will immediately - * interrupt the wait. - */ -int block_job_sleep_ns(BlockJob *job, int64_t ns); - /** * block_job_yield: * @job: The job that calls the function. diff --git a/tests/test-bdrv-drain.c b/tests/test-bdrv-drain.c index d760e2b243..5d47541b4c 100644 --- a/tests/test-bdrv-drain.c +++ b/tests/test-bdrv-drain.c @@ -506,7 +506,7 @@ static void coroutine_fn test_job_start(void *opaque) TestBlockJob *s =3D opaque; =20 while (!s->should_complete) { - block_job_sleep_ns(&s->common, 100000); + block_job_relax(&s->common, 100000); } =20 block_job_defer_to_main_loop(&s->common, test_job_completed, NULL); diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c index 3591c9617f..edcf0de6bd 100644 --- a/tests/test-blockjob-txn.c +++ b/tests/test-blockjob-txn.c @@ -44,7 +44,7 @@ static void coroutine_fn test_block_job_run(void *opaque) =20 while (s->iterations--) { if (s->use_timer) { - block_job_sleep_ns(job, 0); + block_job_relax(job, 0); } else { block_job_yield(job); } --=20 2.14.3