From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aw9a8-0007bD-0Q for qemu-devel@nongnu.org; Fri, 29 Apr 2016 10:40:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aw9Zw-0006rn-2r for qemu-devel@nongnu.org; Fri, 29 Apr 2016 10:39:42 -0400 Date: Fri, 29 Apr 2016 16:38:58 +0200 From: Kevin Wolf Message-ID: <20160429143858.GI4350@noname.redhat.com> References: <41bbdd98675b93ff0d4b4e745d942cfd5c16aa1f.1459776815.git.berto@igalia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <41bbdd98675b93ff0d4b4e745d942cfd5c16aa1f.1459776815.git.berto@igalia.com> Subject: Re: [Qemu-devel] [PATCH v9 04/11] block: use the block job list in bdrv_close() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alberto Garcia Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, Max Reitz , Eric Blake , Stefan Hajnoczi Am 04.04.2016 um 15:43 hat Alberto Garcia geschrieben: > bdrv_close_all() cancels all block jobs by iterating over all > BlockDriverStates. This patch simplifies the code by iterating > directly over the block jobs using block_job_next(). > > Signed-off-by: Alberto Garcia This is essentially the same as I'm doing here: http://repo.or.cz/qemu/kevin.git/commitdiff/6b545b21e3dfe2e3927cfb6bbdcc1b233c67630c I think I like having a separate block_job_cancel_sync_all() function like I did instead of inlining it in bdrv_close_all(), though that's a matter of taste. My patch also moves the call, so having to move only a single line in my patch (assuming it gets rebased on top of this one) seems nicer. Kevin > block.c | 25 ++++++------------------- > 1 file changed, 6 insertions(+), 19 deletions(-) > > diff --git a/block.c b/block.c > index d36eb75..48638c9 100644 > --- a/block.c > +++ b/block.c > @@ -2182,8 +2182,7 @@ static void bdrv_close(BlockDriverState *bs) > > void bdrv_close_all(void) > { > - BlockDriverState *bs; > - AioContext *aio_context; > + BlockJob *job; > > /* Drop references from requests still in flight, such as canceled block > * jobs whose AIO context has not been polled yet */ > @@ -2193,23 +2192,11 @@ void bdrv_close_all(void) > blockdev_close_all_bdrv_states(); > > /* Cancel all block jobs */ > - while (!QTAILQ_EMPTY(&all_bdrv_states)) { > - QTAILQ_FOREACH(bs, &all_bdrv_states, bs_list) { > - aio_context = bdrv_get_aio_context(bs); > - > - aio_context_acquire(aio_context); > - if (bs->job) { > - block_job_cancel_sync(bs->job); > - aio_context_release(aio_context); > - break; > - } > - aio_context_release(aio_context); > - } > - > - /* All the remaining BlockDriverStates are referenced directly or > - * indirectly from block jobs, so there needs to be at least one BDS > - * directly used by a block job */ > - assert(bs); > + while ((job = block_job_next(NULL))) { > + AioContext *aio_context = bdrv_get_aio_context(job->bs); > + aio_context_acquire(aio_context); > + block_job_cancel_sync(job); > + aio_context_release(aio_context); > } > } > > -- > 2.8.0.rc3 >