From nobody Tue Apr 15 14:48:18 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1537889240064551.1923795836718; Tue, 25 Sep 2018 08:27:20 -0700 (PDT) Received: from localhost ([::1]:53704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4pF8-0002Ec-TL for importer@patchew.org; Tue, 25 Sep 2018 11:27:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g4p4Y-0000uR-Rd for qemu-devel@nongnu.org; Tue, 25 Sep 2018 11:16:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g4p4N-0004qM-1T for qemu-devel@nongnu.org; Tue, 25 Sep 2018 11:16:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51762) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g4p4F-0004h2-7h; Tue, 25 Sep 2018 11:16:03 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A078C04AC54; Tue, 25 Sep 2018 15:16:02 +0000 (UTC) Received: from localhost (unknown [10.40.205.127]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D085A1081331; Tue, 25 Sep 2018 15:16:01 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Tue, 25 Sep 2018 17:15:07 +0200 Message-Id: <20180925151541.18932-9-mreitz@redhat.com> In-Reply-To: <20180925151541.18932-1-mreitz@redhat.com> References: <20180925151541.18932-1-mreitz@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 25 Sep 2018 15:16:02 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 08/42] tests/blockjob: replace Blockjob with Job 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: Kevin Wolf , Peter Maydell , qemu-devel@nongnu.org, 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" From: John Snow These tests don't actually test blockjobs anymore, they test generic Job lifetimes. Change the types accordingly. Signed-off-by: John Snow Reviewed-by: Max Reitz Message-id: 20180906130225.5118-9-jsnow@redhat.com Reviewed-by: Jeff Cody Signed-off-by: Max Reitz --- tests/test-blockjob.c | 98 ++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/tests/test-blockjob.c b/tests/test-blockjob.c index ad4a65bc78..8e8b680416 100644 --- a/tests/test-blockjob.c +++ b/tests/test-blockjob.c @@ -206,18 +206,20 @@ static const BlockJobDriver test_cancel_driver =3D { }, }; =20 -static CancelJob *create_common(BlockJob **pjob) +static CancelJob *create_common(Job **pjob) { BlockBackend *blk; - BlockJob *job; + Job *job; + BlockJob *bjob; CancelJob *s; =20 blk =3D create_blk(NULL); - job =3D mk_job(blk, "Steve", &test_cancel_driver, true, - JOB_MANUAL_FINALIZE | JOB_MANUAL_DISMISS); - job_ref(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_CREATED); - s =3D container_of(job, CancelJob, common); + bjob =3D mk_job(blk, "Steve", &test_cancel_driver, true, + JOB_MANUAL_FINALIZE | JOB_MANUAL_DISMISS); + job =3D &bjob->job; + job_ref(job); + assert(job->status =3D=3D JOB_STATUS_CREATED); + s =3D container_of(bjob, CancelJob, common); s->blk =3D blk; =20 *pjob =3D job; @@ -242,7 +244,7 @@ static void cancel_common(CancelJob *s) =20 static void test_cancel_created(void) { - BlockJob *job; + Job *job; CancelJob *s; =20 s =3D create_common(&job); @@ -251,119 +253,119 @@ static void test_cancel_created(void) =20 static void test_cancel_running(void) { - BlockJob *job; + Job *job; CancelJob *s; =20 s =3D create_common(&job); =20 - job_start(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_RUNNING); + job_start(job); + assert(job->status =3D=3D JOB_STATUS_RUNNING); =20 cancel_common(s); } =20 static void test_cancel_paused(void) { - BlockJob *job; + Job *job; CancelJob *s; =20 s =3D create_common(&job); =20 - job_start(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_RUNNING); + job_start(job); + assert(job->status =3D=3D JOB_STATUS_RUNNING); =20 - job_user_pause(&job->job, &error_abort); - job_enter(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_PAUSED); + job_user_pause(job, &error_abort); + job_enter(job); + assert(job->status =3D=3D JOB_STATUS_PAUSED); =20 cancel_common(s); } =20 static void test_cancel_ready(void) { - BlockJob *job; + Job *job; CancelJob *s; =20 s =3D create_common(&job); =20 - job_start(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_RUNNING); + job_start(job); + assert(job->status =3D=3D JOB_STATUS_RUNNING); =20 s->should_converge =3D true; - job_enter(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_READY); + job_enter(job); + assert(job->status =3D=3D JOB_STATUS_READY); =20 cancel_common(s); } =20 static void test_cancel_standby(void) { - BlockJob *job; + Job *job; CancelJob *s; =20 s =3D create_common(&job); =20 - job_start(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_RUNNING); + job_start(job); + assert(job->status =3D=3D JOB_STATUS_RUNNING); =20 s->should_converge =3D true; - job_enter(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_READY); + job_enter(job); + assert(job->status =3D=3D JOB_STATUS_READY); =20 - job_user_pause(&job->job, &error_abort); - job_enter(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_STANDBY); + job_user_pause(job, &error_abort); + job_enter(job); + assert(job->status =3D=3D JOB_STATUS_STANDBY); =20 cancel_common(s); } =20 static void test_cancel_pending(void) { - BlockJob *job; + Job *job; CancelJob *s; =20 s =3D create_common(&job); =20 - job_start(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_RUNNING); + job_start(job); + assert(job->status =3D=3D JOB_STATUS_RUNNING); =20 s->should_converge =3D true; - job_enter(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_READY); + job_enter(job); + assert(job->status =3D=3D JOB_STATUS_READY); =20 - job_complete(&job->job, &error_abort); - job_enter(&job->job); + job_complete(job, &error_abort); + job_enter(job); while (!s->completed) { aio_poll(qemu_get_aio_context(), true); } - assert(job->job.status =3D=3D JOB_STATUS_PENDING); + assert(job->status =3D=3D JOB_STATUS_PENDING); =20 cancel_common(s); } =20 static void test_cancel_concluded(void) { - BlockJob *job; + Job *job; CancelJob *s; =20 s =3D create_common(&job); =20 - job_start(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_RUNNING); + job_start(job); + assert(job->status =3D=3D JOB_STATUS_RUNNING); =20 s->should_converge =3D true; - job_enter(&job->job); - assert(job->job.status =3D=3D JOB_STATUS_READY); + job_enter(job); + assert(job->status =3D=3D JOB_STATUS_READY); =20 - job_complete(&job->job, &error_abort); - job_enter(&job->job); + job_complete(job, &error_abort); + job_enter(job); while (!s->completed) { aio_poll(qemu_get_aio_context(), true); } - assert(job->job.status =3D=3D JOB_STATUS_PENDING); + assert(job->status =3D=3D JOB_STATUS_PENDING); =20 - job_finalize(&job->job, &error_abort); - assert(job->job.status =3D=3D JOB_STATUS_CONCLUDED); + job_finalize(job, &error_abort); + assert(job->status =3D=3D JOB_STATUS_CONCLUDED); =20 cancel_common(s); } --=20 2.17.1