From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEmqG-0003Og-By for qemu-devel@nongnu.org; Mon, 13 Jul 2015 19:08:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZEmqF-0006n9-9g for qemu-devel@nongnu.org; Mon, 13 Jul 2015 19:08:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59775) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZEmqF-0006n5-4q for qemu-devel@nongnu.org; Mon, 13 Jul 2015 19:08:55 -0400 Message-ID: <55A44505.3010208@redhat.com> Date: Mon, 13 Jul 2015 19:08:53 -0400 From: John Snow MIME-Version: 1.0 References: <1436500012-32593-1-git-send-email-famz@redhat.com> <1436500012-32593-9-git-send-email-famz@redhat.com> In-Reply-To: <1436500012-32593-9-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 08/15] blockjob: Simplify block_job_finish_sync List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , Jeff Cody , vsementsov@parallels.com, stefanha@redhat.com, Max Reitz On 07/09/2015 11:46 PM, Fam Zheng wrote: > With job->completed and job->ret to replace BlockFinishData. > > Signed-off-by: Fam Zheng > --- > blockjob.c | 23 ++--------------------- > 1 file changed, 2 insertions(+), 21 deletions(-) > > diff --git a/blockjob.c b/blockjob.c > index fb1d9e7..11b48f5 100644 > --- a/blockjob.c > +++ b/blockjob.c > @@ -179,43 +179,24 @@ struct BlockFinishData { > int ret; > }; > > -static void block_job_finish_cb(void *opaque, int ret) > -{ > - struct BlockFinishData *data = opaque; > - > - data->cancelled = block_job_is_cancelled(data->job); > - data->ret = ret; > - data->cb(data->opaque, ret); > -} > - > static int block_job_finish_sync(BlockJob *job, > void (*finish)(BlockJob *, Error **errp), > Error **errp) > { > - struct BlockFinishData data; > BlockDriverState *bs = job->bs; > Error *local_err = NULL; > > assert(bs->job == job); > > - /* Set up our own callback to store the result and chain to > - * the original callback. > - */ > - data.job = job; > - data.cb = job->cb; > - data.opaque = job->opaque; > - data.ret = -EINPROGRESS; > - job->cb = block_job_finish_cb; > - job->opaque = &data; > finish(job, &local_err); > if (local_err) { > error_propagate(errp, local_err); > return -EBUSY; > } > - while (data.ret == -EINPROGRESS) { > + while (!job->completed) { > aio_poll(bdrv_get_aio_context(bs), true); > } > - return (data.cancelled && data.ret == 0) ? -ECANCELED : data.ret; > + return (job->cancelled && job->ret == 0) ? -ECANCELED : job->ret; > } > > /* A wrapper around block_job_cancel() taking an Error ** parameter so it may be > Hmm ... I'm less sure of this one because I can't imagine why it's split out the way it is to begin with. Looks sane to me, though... Reviewed-by: John Snow