From nobody Wed Oct 29 17:26:04 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 1526651877290152.20013928696358; Fri, 18 May 2018 06:57:57 -0700 (PDT) Received: from localhost ([::1]:39120 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJftI-0008CB-Vw for importer@patchew.org; Fri, 18 May 2018 09:57:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fJfL6-0000eR-6E for qemu-devel@nongnu.org; Fri, 18 May 2018 09:22:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fJfL0-0006VF-Bb for qemu-devel@nongnu.org; Fri, 18 May 2018 09:22:32 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46732 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 1fJfKw-0006RY-5y; Fri, 18 May 2018 09:22:22 -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 C7A1D81FE16E; Fri, 18 May 2018 13:22:21 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-149.ams2.redhat.com [10.36.117.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AE3E2026DFD; Fri, 18 May 2018 13:22:20 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 18 May 2018 15:21:12 +0200 Message-Id: <20180518132114.4070-39-kwolf@redhat.com> In-Reply-To: <20180518132114.4070-1-kwolf@redhat.com> References: <20180518132114.4070-1-kwolf@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.8]); Fri, 18 May 2018 13:22:21 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 18 May 2018 13:22:21 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@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 v2 38/40] blockjob: Remove BlockJob.driver 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, qemu-devel@nongnu.org, jsnow@redhat.com, jcody@redhat.com, armbru@redhat.com, mreitz@redhat.com 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" BlockJob.driver is redundant with Job.driver and only used in very few places any more. Remove it. Signed-off-by: Kevin Wolf --- include/block/blockjob.h | 3 --- blockjob.c | 17 ++++++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 3021d11126..32c00b7dc0 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -43,9 +43,6 @@ typedef struct BlockJob { /** Data belonging to the generic Job infrastructure */ Job job; =20 - /** The job type, including the job vtable. */ - const BlockJobDriver *driver; - /** The block device on which the job is operating. */ BlockBackend *blk; =20 diff --git a/blockjob.c b/blockjob.c index 5c8ff6f846..0306533a2e 100644 --- a/blockjob.c +++ b/blockjob.c @@ -103,10 +103,12 @@ static void block_job_attached_aio_context(AioContext= *new_context, void *opaque) { BlockJob *job =3D opaque; + const JobDriver *drv =3D job->job.driver; + BlockJobDriver *bjdrv =3D container_of(drv, BlockJobDriver, job_driver= ); =20 job->job.aio_context =3D new_context; - if (job->driver->attached_aio_context) { - job->driver->attached_aio_context(job, new_context); + if (bjdrv->attached_aio_context) { + bjdrv->attached_aio_context(job, new_context); } =20 job_resume(&job->job); @@ -115,10 +117,12 @@ static void block_job_attached_aio_context(AioContext= *new_context, void block_job_drain(Job *job) { BlockJob *bjob =3D container_of(job, BlockJob, job); + const JobDriver *drv =3D job->driver; + BlockJobDriver *bjdrv =3D container_of(drv, BlockJobDriver, job_driver= ); =20 blk_drain(bjob->blk); - if (bjob->driver->drain) { - bjob->driver->drain(bjob); + if (bjdrv->drain) { + bjdrv->drain(bjob); } } =20 @@ -201,7 +205,7 @@ bool block_job_is_internal(BlockJob *job) =20 const BlockJobDriver *block_job_driver(BlockJob *job) { - return job->driver; + return container_of(job->job.driver, BlockJobDriver, job_driver); } =20 /* Assumes the job_mutex is held */ @@ -386,8 +390,7 @@ void *block_job_create(const char *job_id, const BlockJ= obDriver *driver, assert(job->job.driver->user_resume =3D=3D &block_job_user_resume); assert(job->job.driver->drain =3D=3D &block_job_drain); =20 - job->driver =3D driver; - job->blk =3D blk; + job->blk =3D blk; =20 job->finalize_cancelled_notifier.notify =3D block_job_event_cancelled; job->finalize_completed_notifier.notify =3D block_job_event_completed; --=20 2.13.6