From nobody Wed Oct 29 09:08:30 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 1524584515935260.00150650832506; Tue, 24 Apr 2018 08:41:55 -0700 (PDT) Received: from localhost ([::1]:59176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB04i-0003bE-MY for importer@patchew.org; Tue, 24 Apr 2018 11:41:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47728) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fAzpA-0007x7-CZ for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:25:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fAzp6-00082i-Ve for qemu-devel@nongnu.org; Tue, 24 Apr 2018 11:25:44 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45620 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 1fAzp3-0007uy-F2; Tue, 24 Apr 2018 11:25:37 -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 10087407574E; Tue, 24 Apr 2018 15:25:37 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-100.ams2.redhat.com [10.36.117.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 00EB9202323A; Tue, 24 Apr 2018 15:25:35 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Tue, 24 Apr 2018 17:24:53 +0200 Message-Id: <20180424152515.25664-12-kwolf@redhat.com> In-Reply-To: <20180424152515.25664-1-kwolf@redhat.com> References: <20180424152515.25664-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.7]); Tue, 24 Apr 2018 15:25:37 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Tue, 24 Apr 2018 15:25:37 +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] [RFC PATCH 11/33] job: Maintain a list of all jobs 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, jsnow@redhat.com, qemu-devel@nongnu.org, 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" This moves the job list from BlockJob to Job. Now we can check for duplicate IDs in job_create(). Signed-off-by: Kevin Wolf --- include/block/blockjob.h | 3 --- include/qemu/job.h | 19 +++++++++++++++++++ blockjob.c | 47 +++++++++++++++++++++++++-------------------= --- job.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 75 insertions(+), 25 deletions(-) diff --git a/include/block/blockjob.h b/include/block/blockjob.h index 8acc1a236a..8946f118f3 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -105,9 +105,6 @@ typedef struct BlockJob { */ bool deferred_to_main_loop; =20 - /** Element of the list of block jobs */ - QLIST_ENTRY(BlockJob) job_list; - /** Status that is published by the query-block-jobs QMP API */ BlockDeviceIoStatus iostatus; =20 diff --git a/include/qemu/job.h b/include/qemu/job.h index ee1f5d1ef4..6555ab4c36 100644 --- a/include/qemu/job.h +++ b/include/qemu/job.h @@ -27,6 +27,7 @@ #define JOB_H =20 #include "qapi/qapi-types-block-core.h" +#include "qemu/queue.h" =20 typedef struct JobDriver JobDriver; =20 @@ -39,6 +40,9 @@ typedef struct Job { =20 /** The type of this job. */ const JobDriver *driver; + + /** Element of the list of jobs */ + QLIST_ENTRY(Job) job_list; } Job; =20 /** @@ -71,4 +75,19 @@ JobType job_type(Job *job); /** Returns the enum string for the JobType of a given Job. */ const char *job_type_str(Job *job); =20 +/** + * Get the next element from the list of block jobs after @job, or the + * first one if @job is %NULL. + * + * Returns the requested job, or %NULL if there are no more jobs left. + */ +Job *job_next(Job *job); + +/** + * Get the job identified by @id (which must not be %NULL). + * + * Returns the requested job, or %NULL if it doesn't exist. + */ +Job *job_get(const char *id); + #endif diff --git a/blockjob.c b/blockjob.c index 041a1e58d2..6020a067a3 100644 --- a/blockjob.c +++ b/blockjob.c @@ -129,8 +129,6 @@ struct BlockJobTxn { int refcnt; }; =20 -static QLIST_HEAD(, BlockJob) block_jobs =3D QLIST_HEAD_INITIALIZER(block_= jobs); - /* * The block job API is composed of two categories of functions. * @@ -146,25 +144,35 @@ static QLIST_HEAD(, BlockJob) block_jobs =3D QLIST_HE= AD_INITIALIZER(block_jobs); * blockjob_int.h. */ =20 -BlockJob *block_job_next(BlockJob *job) +static bool is_block_job(Job *job) { - if (!job) { - return QLIST_FIRST(&block_jobs); - } - return QLIST_NEXT(job, job_list); + return job_type(job) =3D=3D JOB_TYPE_BACKUP || + job_type(job) =3D=3D JOB_TYPE_COMMIT || + job_type(job) =3D=3D JOB_TYPE_MIRROR || + job_type(job) =3D=3D JOB_TYPE_STREAM; +} + +BlockJob *block_job_next(BlockJob *bjob) +{ + Job *job =3D &bjob->job; + + do { + job =3D job_next(job); + } while (job && !is_block_job(job)); + + + return job ? container_of(job, BlockJob, job) : NULL; } =20 BlockJob *block_job_get(const char *id) { - BlockJob *job; + Job *job =3D job_get(id); =20 - QLIST_FOREACH(job, &block_jobs, job_list) { - if (job->job.id && !strcmp(id, job->job.id)) { - return job; - } + if (job && is_block_job(job)) { + return container_of(job, BlockJob, job); + } else { + return NULL; } - - return NULL; } =20 BlockJobTxn *block_job_txn_new(void) @@ -239,7 +247,6 @@ void block_job_unref(BlockJob *job) assert(job->status =3D=3D BLOCK_JOB_STATUS_NULL); assert(!job->txn); BlockDriverState *bs =3D blk_bs(job->blk); - QLIST_REMOVE(job, job_list); bs->job =3D NULL; block_job_remove_all_bdrv(job); blk_remove_aio_context_notifier(job->blk, @@ -804,7 +811,7 @@ void block_job_cancel_sync_all(void) BlockJob *job; AioContext *aio_context; =20 - while ((job =3D QLIST_FIRST(&block_jobs))) { + while ((job =3D block_job_next(NULL))) { aio_context =3D blk_get_aio_context(job->blk); aio_context_acquire(aio_context); block_job_cancel_sync(job); @@ -932,10 +939,6 @@ void *block_job_create(const char *job_id, const Block= JobDriver *driver, error_setg(errp, "Cannot specify job ID for internal block job= "); return NULL; } - if (block_job_get(job_id)) { - error_setg(errp, "Job ID '%s' already in use", job_id); - return NULL; - } } =20 blk =3D blk_new(perm, shared_perm); @@ -951,6 +954,8 @@ void *block_job_create(const char *job_id, const BlockJ= obDriver *driver, return NULL; } =20 + assert(is_block_job(&job->job)); + job->driver =3D driver; job->blk =3D blk; job->cb =3D cb; @@ -973,8 +978,6 @@ void *block_job_create(const char *job_id, const BlockJ= obDriver *driver, =20 bdrv_op_unblock(bs, BLOCK_OP_TYPE_DATAPLANE, job->blocker); =20 - QLIST_INSERT_HEAD(&block_jobs, job, job_list); - blk_add_aio_context_notifier(blk, block_job_attached_aio_context, block_job_detach_aio_context, job); =20 diff --git a/job.c b/job.c index a36425498d..00f7968c50 100644 --- a/job.c +++ b/job.c @@ -29,6 +29,8 @@ #include "qemu/job.h" #include "qemu/id.h" =20 +static QLIST_HEAD(, Job) jobs =3D QLIST_HEAD_INITIALIZER(jobs); + JobType job_type(Job *job) { return job->driver->job_type; @@ -39,6 +41,27 @@ const char *job_type_str(Job *job) return JobType_str(job_type(job)); } =20 +Job *job_next(Job *job) +{ + if (!job) { + return QLIST_FIRST(&jobs); + } + return QLIST_NEXT(job, job_list); +} + +Job *job_get(const char *id) +{ + Job *job; + + QLIST_FOREACH(job, &jobs, job_list) { + if (job->id && !strcmp(id, job->id)) { + return job; + } + } + + return NULL; +} + void *job_create(const char *job_id, const JobDriver *driver, Error **errp) { Job *job; @@ -48,17 +71,25 @@ void *job_create(const char *job_id, const JobDriver *d= river, Error **errp) error_setg(errp, "Invalid job ID '%s'", job_id); return NULL; } + if (job_get(job_id)) { + error_setg(errp, "Job ID '%s' already in use", job_id); + return NULL; + } } =20 job =3D g_malloc0(driver->instance_size); job->driver =3D driver; job->id =3D g_strdup(job_id); =20 + QLIST_INSERT_HEAD(&jobs, job, job_list); + return job; } =20 void job_delete(Job *job) { + QLIST_REMOVE(job, job_list); + g_free(job->id); g_free(job); } --=20 2.13.6