From nobody Wed Nov 5 07:32:45 2025 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1533617130036213.1240690347862; Mon, 6 Aug 2018 21:45:30 -0700 (PDT) Received: from localhost ([::1]:37320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmts2-00075n-WB for importer@patchew.org; Tue, 07 Aug 2018 00:45:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53876) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fmth2-0004fa-A4 for qemu-devel@nongnu.org; Tue, 07 Aug 2018 00:34:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fmtgz-0001Fr-QZ for qemu-devel@nongnu.org; Tue, 07 Aug 2018 00:34:00 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53692 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fmtgw-0001Cc-Bs; Tue, 07 Aug 2018 00:33:54 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B15A440241C5; Tue, 7 Aug 2018 04:33:53 +0000 (UTC) Received: from probe.bos.redhat.com (dhcp-17-197.bos.redhat.com [10.18.17.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6378520180F4; Tue, 7 Aug 2018 04:33:53 +0000 (UTC) From: John Snow To: qemu-devel@nongnu.org, qemu-block@nongnu.org Date: Tue, 7 Aug 2018 00:33:37 -0400 Message-Id: <20180807043349.27196-10-jsnow@redhat.com> In-Reply-To: <20180807043349.27196-1-jsnow@redhat.com> References: <20180807043349.27196-1-jsnow@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 07 Aug 2018 04:33:53 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 07 Aug 2018 04:33:53 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jsnow@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 09/21] tests/test-blockjob: utilize job_exit shim 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, John Snow , Jeff Cody , Markus Armbruster , "Dr. David Alan Gilbert" , jtc@redhat.com, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Change the manual deferment to test_block_job_complete into the implicit callback to job_exit. Signed-off-by: John Snow --- tests/test-blockjob.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index e408d52351..20563bde4f 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -163,11 +163,10 @@ typedef struct CancelJob { bool completed; } CancelJob; =20 -static void cancel_job_completed(Job *job, void *opaque) +static void cancel_job_exit(Job *job) { - CancelJob *s =3D opaque; + CancelJob *s =3D container_of(job, CancelJob, common.job); s->completed =3D true; - job_completed(job, 0); } =20 static void cancel_job_complete(Job *job, Error **errp) @@ -182,7 +181,7 @@ static void coroutine_fn cancel_job_start(void *opaque) =20 while (!s->should_complete) { if (job_is_cancelled(&s->common.job)) { - goto defer; + return; } =20 if (!job_is_ready(&s->common.job) && s->should_converge) { @@ -191,9 +190,6 @@ static void coroutine_fn cancel_job_start(void *opaque) =20 job_sleep_ns(&s->common.job, 100000); } - - defer: - job_defer_to_main_loop(&s->common.job, cancel_job_completed, s); } =20 static const BlockJobDriver test_cancel_driver =3D { @@ -203,6 +199,7 @@ static const BlockJobDriver test_cancel_driver =3D { .user_resume =3D block_job_user_resume, .drain =3D block_job_drain, .start =3D cancel_job_start, + .exit =3D cancel_job_exit, .complete =3D cancel_job_complete, }, }; --=20 2.14.4