From patchwork Fri Apr 24 15:01:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alberto Garcia X-Patchwork-Id: 464226 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B6711140134 for ; Sat, 25 Apr 2015 01:04:49 +1000 (AEST) Received: from localhost ([::1]:45221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ylf9r-0000uM-Ma for incoming@patchwork.ozlabs.org; Fri, 24 Apr 2015 11:04:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ylf7I-00047p-76 for qemu-devel@nongnu.org; Fri, 24 Apr 2015 11:02:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ylf7E-0006Fn-19 for qemu-devel@nongnu.org; Fri, 24 Apr 2015 11:02:08 -0400 Received: from smtp3.mundo-r.com ([212.51.32.191]:51751 helo=smtp4.mundo-r.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ylf7D-0006EX-Pa; Fri, 24 Apr 2015 11:02:03 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AucFALVZOlVbdWOb/2dsb2JhbABbgwyBLrRoBAUBgQKYPQKBPUwBAQEBAQGBC4QhAQEEJ1IQUTwbGYgvAcwaAQEBByKGFoolB4QtBYZChRaQM5VVI2CBJxyBVDsxgkQBAQE X-IPAS-Result: AucFALVZOlVbdWOb/2dsb2JhbABbgwyBLrRoBAUBgQKYPQKBPUwBAQEBAQGBC4QhAQEEJ1IQUTwbGYgvAcwaAQEBByKGFoolB4QtBYZChRaQM5VVI2CBJxyBVDsxgkQBAQE X-IronPort-AV: E=Sophos;i="5.11,640,1422918000"; d="scan'208";a="345267692" Received: from fanzine.igalia.com ([91.117.99.155]) by smtp4.mundo-r.com with ESMTP; 24 Apr 2015 17:01:59 +0200 Received: from maestria.local.igalia.com ([192.168.10.14] helo=mail.igalia.com) by fanzine.igalia.com with esmtps (Cipher TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim) id 1Ylf79-0004vS-ML; Fri, 24 Apr 2015 17:01:59 +0200 Received: from fanzine.local.igalia.com ([192.168.10.13] helo=perseus.local) by mail.igalia.com with esmtps (Cipher TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim) id 1Ylf78-0007GI-SG; Fri, 24 Apr 2015 17:01:59 +0200 Received: from berto by perseus.local with local (Exim 4.84) (envelope-from ) id 1Ylf77-0005Up-99; Fri, 24 Apr 2015 18:01:57 +0300 From: Alberto Garcia To: qemu-devel@nongnu.org Date: Fri, 24 Apr 2015 18:01:45 +0300 Message-Id: <7382e2fdfaaa7b39a62733ab757f376abc1bb115.1429885069.git.berto@igalia.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.51.32.191 Cc: Kevin Wolf , Alberto Garcia , qemu-block@nongnu.org, Max Reitz , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 01/11] block: keep a list of block jobs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The current way to obtain the list of existing block jobs is to iterate over all root nodes and check which ones own a job. Since we want to be able to support block jobs in other nodes as well, this patch keeps a list of jobs that is updated every time one is created or destroyed. This also updates qmp_query_block_jobs() to use this new list. Signed-off-by: Alberto Garcia Reviewed-by: Max Reitz Reviewed-by: Eric Blake --- blockdev.c | 19 ++++++++----------- blockjob.c | 13 +++++++++++++ include/block/blockjob.h | 14 ++++++++++++++ 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/blockdev.c b/blockdev.c index 30dc9d2..567d5e3 100644 --- a/blockdev.c +++ b/blockdev.c @@ -2901,21 +2901,18 @@ fail: BlockJobInfoList *qmp_query_block_jobs(Error **errp) { BlockJobInfoList *head = NULL, **p_next = &head; - BlockDriverState *bs; + BlockJob *job; - for (bs = bdrv_next(NULL); bs; bs = bdrv_next(bs)) { - AioContext *aio_context = bdrv_get_aio_context(bs); + for (job = block_job_next(NULL); job; job = block_job_next(job)) { + BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1); + AioContext *aio_context = bdrv_get_aio_context(job->bs); aio_context_acquire(aio_context); - - if (bs->job) { - BlockJobInfoList *elem = g_new0(BlockJobInfoList, 1); - elem->value = block_job_query(bs->job); - *p_next = elem; - p_next = &elem->next; - } - + elem->value = block_job_query(job); aio_context_release(aio_context); + + *p_next = elem; + p_next = &elem->next; } return head; diff --git a/blockjob.c b/blockjob.c index ba2255d..562362b 100644 --- a/blockjob.c +++ b/blockjob.c @@ -35,6 +35,16 @@ #include "qemu/timer.h" #include "qapi-event.h" +static QLIST_HEAD(, BlockJob) block_jobs = QLIST_HEAD_INITIALIZER(block_jobs); + +BlockJob *block_job_next(BlockJob *job) +{ + if (!job) { + return QLIST_FIRST(&block_jobs); + } + return QLIST_NEXT(job, job_list); +} + void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, int64_t speed, BlockCompletionFunc *cb, void *opaque, Error **errp) @@ -73,6 +83,8 @@ void *block_job_create(const BlockJobDriver *driver, BlockDriverState *bs, return NULL; } } + + QLIST_INSERT_HEAD(&block_jobs, job, job_list); return job; } @@ -85,6 +97,7 @@ void block_job_completed(BlockJob *job, int ret) bs->job = NULL; bdrv_op_unblock_all(bs, job->blocker); error_free(job->blocker); + QLIST_REMOVE(job, job_list); g_free(job); } diff --git a/include/block/blockjob.h b/include/block/blockjob.h index b6d4ebb..636204b 100644 --- a/include/block/blockjob.h +++ b/include/block/blockjob.h @@ -96,6 +96,9 @@ struct BlockJob { */ bool ready; + /** 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; @@ -119,6 +122,17 @@ struct BlockJob { }; /** + * block_job_next: + * @job: A block job, or %NULL. + * + * 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. + */ +BlockJob *block_job_next(BlockJob *job); + +/** * block_job_create: * @job_type: The class object for the newly-created job. * @bs: The block