Re: [Qemu-devel] [PATCH v3 02/19] block: add flags to BlockRequest

[Peter Lieven <pl@kamp.de>]

On 22.11.2013 13:39, Paolo Bonzini wrote:
> This lets bdrv_co_do_rw receive flags, so that it can be used for
> zero writes.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   block.c               | 17 +++++++++++------
>   include/block/block.h |  1 +
>   2 files changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/block.c b/block.c
> index 1b3e8b2..0665f35 100644
> --- a/block.c
> +++ b/block.c
> @@ -74,6 +74,7 @@ static BlockDriverAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs,
>                                                  int64_t sector_num,
>                                                  QEMUIOVector *qiov,
>                                                  int nb_sectors,
> +                                               BdrvRequestFlags flags,
>                                                  BlockDriverCompletionFunc *cb,
>                                                  void *opaque,
>                                                  bool is_write);
> @@ -3655,7 +3656,7 @@ BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs, int64_t sector_num,
>   {
>       trace_bdrv_aio_readv(bs, sector_num, nb_sectors, opaque);
>   
> -    return bdrv_co_aio_rw_vector(bs, sector_num, qiov, nb_sectors,
> +    return bdrv_co_aio_rw_vector(bs, sector_num, qiov, nb_sectors, 0,
>                                    cb, opaque, false);
>   }
>   
> @@ -3665,7 +3666,7 @@ BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,
>   {
>       trace_bdrv_aio_writev(bs, sector_num, nb_sectors, opaque);
>   
> -    return bdrv_co_aio_rw_vector(bs, sector_num, qiov, nb_sectors,
> +    return bdrv_co_aio_rw_vector(bs, sector_num, qiov, nb_sectors, 0,
>                                    cb, opaque, true);
>   }
>   
> @@ -3837,8 +3838,10 @@ int bdrv_aio_multiwrite(BlockDriverState *bs, BlockRequest *reqs, int num_reqs)
>       /* Run the aio requests. */
>       mcb->num_requests = num_reqs;
>       for (i = 0; i < num_reqs; i++) {
> -        bdrv_aio_writev(bs, reqs[i].sector, reqs[i].qiov,
> -            reqs[i].nb_sectors, multiwrite_cb, mcb);
> +        bdrv_co_aio_rw_vector(bs, reqs[i].sector, reqs[i].qiov,
> +                              reqs[i].nb_sectors, reqs[i].flags,
> +                              multiwrite_cb, mcb,
> +                              true);
>       }
>   
>       return 0;
> @@ -3980,10 +3983,10 @@ static void coroutine_fn bdrv_co_do_rw(void *opaque)
>   
>       if (!acb->is_write) {
>           acb->req.error = bdrv_co_do_readv(bs, acb->req.sector,
> -            acb->req.nb_sectors, acb->req.qiov, 0);
> +            acb->req.nb_sectors, acb->req.qiov, acb->req.flags);
>       } else {
>           acb->req.error = bdrv_co_do_writev(bs, acb->req.sector,
> -            acb->req.nb_sectors, acb->req.qiov, 0);
> +            acb->req.nb_sectors, acb->req.qiov, acb->req.flags);
>       }
>   
>       acb->bh = qemu_bh_new(bdrv_co_em_bh, acb);
> @@ -3994,6 +3997,7 @@ static BlockDriverAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs,
>                                                  int64_t sector_num,
>                                                  QEMUIOVector *qiov,
>                                                  int nb_sectors,
> +                                               BdrvRequestFlags flags,
>                                                  BlockDriverCompletionFunc *cb,
>                                                  void *opaque,
>                                                  bool is_write)
> @@ -4005,6 +4009,7 @@ static BlockDriverAIOCB *bdrv_co_aio_rw_vector(BlockDriverState *bs,
>       acb->req.sector = sector_num;
>       acb->req.nb_sectors = nb_sectors;
>       acb->req.qiov = qiov;
> +    acb->req.flags = flags;
>       acb->is_write = is_write;
>       acb->done = NULL;
>   
> diff --git a/include/block/block.h b/include/block/block.h
> index 4d9e67c..703d875 100644
> --- a/include/block/block.h
> +++ b/include/block/block.h
> @@ -311,6 +311,7 @@ typedef struct BlockRequest {
>       /* Fields to be filled by multiwrite caller */
>       int64_t sector;
>       int nb_sectors;
> +    int flags;
>       QEMUIOVector *qiov;
>       BlockDriverCompletionFunc *cb;
>       void *opaque;
Reviewed-by: Peter Lieven <pl@kamp.de>