[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 08/15] blockjob: Simplify block_job_finish_sy
From: |
John Snow |
Subject: |
Re: [Qemu-devel] [PATCH v3 08/15] blockjob: Simplify block_job_finish_sync |
Date: |
Mon, 13 Jul 2015 19:08:53 -0400 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 |
On 07/09/2015 11:46 PM, Fam Zheng wrote:
> With job->completed and job->ret to replace BlockFinishData.
>
> Signed-off-by: Fam Zheng <address@hidden>
> ---
> 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 <address@hidden>
- Re: [Qemu-devel] [PATCH v3 05/15] backup: Extract dirty bitmap handling as a separate function, (continued)
- [Qemu-devel] [PATCH v3 06/15] blockjob: Add .txn_commit and .txn_abort transaction actions, Fam Zheng, 2015/07/09
- [Qemu-devel] [PATCH v3 07/15] blockjob: Add "completed" and "ret" in BlockJob, Fam Zheng, 2015/07/09
- [Qemu-devel] [PATCH v3 08/15] blockjob: Simplify block_job_finish_sync, Fam Zheng, 2015/07/09
- Re: [Qemu-devel] [PATCH v3 08/15] blockjob: Simplify block_job_finish_sync,
John Snow <=
- [Qemu-devel] [PATCH v3 09/15] blockjob: Move BlockJobDeferToMainLoopData into BlockJob, Fam Zheng, 2015/07/09
- [Qemu-devel] [PATCH v3 10/15] block: add block job transactions, Fam Zheng, 2015/07/09
- Re: [Qemu-devel] [PATCH v3 10/15] block: add block job transactions, Stefan Hajnoczi, 2015/07/14
- [Qemu-devel] [PATCH v3 11/15] blockdev: make BlockJobTxn available to qmp 'transaction', Fam Zheng, 2015/07/09
- [Qemu-devel] [PATCH v3 12/15] block/backup: support block job transactions, Fam Zheng, 2015/07/09