Re: [PATCH 06/18] block: Implement blk_{pread, pwrite}() using generated_co_wrapper

[Paolo Bonzini]

On 5/17/22 13:38, Alberto Faria wrote:
> We need to add include/sysemu/block-backend-io.h to the inputs of the
> block-gen.c target defined in block/meson.build.
>
> Signed-off-by: Alberto Faria <afaria@redhat.com>

Emanuele is looking it cleaning this up, so you two need to coordinate.

Emanuele, can you separate/post the initial patches to clean up the 
includes of block/coroutines.h and block/block-gen.c?

Apart from that, fewer block/coroutines.h declarations is only good stuff.

Thanks,

Paolo

> ---
>   block/block-backend.c             | 23 -----------------------
>   block/coroutines.h                |  4 ----
>   block/meson.build                 |  1 +
>   include/sysemu/block-backend-io.h | 10 ++++++----
>   4 files changed, 7 insertions(+), 31 deletions(-)
>
> diff --git a/block/block-backend.c b/block/block-backend.c
> index 5b9706c443..c2a4c44a99 100644
> --- a/block/block-backend.c
> +++ b/block/block-backend.c
> @@ -1567,29 +1567,6 @@ BlockAIOCB *blk_aio_pwrite_zeroes(BlockBackend *blk, 
> int64_t offset,
>                           flags | BDRV_REQ_ZERO_WRITE, cb, opaque);
>   }
>   
> -int blk_pread(BlockBackend *blk, int64_t offset, int64_t bytes, void *buf,
> -              BdrvRequestFlags flags)
> -{
> -    int ret;
> -    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
> -    IO_OR_GS_CODE();
> -
> -    blk_inc_in_flight(blk);
> -    ret = blk_do_preadv(blk, offset, bytes, &qiov, flags);
> -    blk_dec_in_flight(blk);
> -
> -    return ret;
> -}
> -
> -int blk_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes,
> -               const void *buf, BdrvRequestFlags flags)
> -{
> -    QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, buf, bytes);
> -    IO_OR_GS_CODE();
> -
> -    return blk_pwritev_part(blk, offset, bytes, &qiov, 0, flags);
> -}
> -
>   int64_t blk_getlength(BlockBackend *blk)
>   {
>       IO_CODE();
> diff --git a/block/coroutines.h b/block/coroutines.h
> index 3f41238b33..443ef2f2e6 100644
> --- a/block/coroutines.h
> +++ b/block/coroutines.h
> @@ -112,10 +112,6 @@ bdrv_common_block_status_above(BlockDriverState *bs,
>   int generated_co_wrapper
>   nbd_do_establish_connection(BlockDriverState *bs, bool blocking, Error 
> **errp);
>   
> -int generated_co_wrapper
> -blk_do_preadv(BlockBackend *blk, int64_t offset, int64_t bytes,
> -              QEMUIOVector *qiov, BdrvRequestFlags flags);
> -
>   int generated_co_wrapper
>   blk_do_pwritev_part(BlockBackend *blk, int64_t offset, int64_t bytes,
>                       QEMUIOVector *qiov, size_t qiov_offset,
> diff --git a/block/meson.build b/block/meson.build
> index 0b2a60c99b..60bc305597 100644
> --- a/block/meson.build
> +++ b/block/meson.build
> @@ -136,6 +136,7 @@ block_gen_c = custom_target('block-gen.c',
>                               input: files(
>                                         '../include/block/block-io.h',
>                                         '../include/block/block-global-state.h',
> +                                      '../include/sysemu/block-backend-io.h',
>                                         'coroutines.h'
>                                         ),
>                               command: [wrapper_py, '@OUTPUT@', '@INPUT@'])
> diff --git a/include/sysemu/block-backend-io.h 
> b/include/sysemu/block-backend-io.h
> index 6440e92028..0804ce1c1d 100644
> --- a/include/sysemu/block-backend-io.h
> +++ b/include/sysemu/block-backend-io.h
> @@ -102,10 +102,12 @@ int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, 
> int64_t off_in,
>    * the "I/O or GS" API.
>    */
>   
> -int blk_pread(BlockBackend *blk, int64_t offset, int64_t bytes, void *buf,
> -              BdrvRequestFlags flags);
> -int blk_pwrite(BlockBackend *blk, int64_t offset, int64_t bytes,
> -               const void *buf, BdrvRequestFlags flags);
> +int generated_co_wrapper blk_pread(BlockBackend *blk, int64_t offset,
> +                                   int64_t bytes, void *buf,
> +                                   BdrvRequestFlags flags);
> +int generated_co_wrapper blk_pwrite(BlockBackend *blk, int64_t offset,
> +                                    int64_t bytes, const void *buf,
> +                                    BdrvRequestFlags flags);
>   int coroutine_fn blk_co_preadv(BlockBackend *blk, int64_t offset,
>                                  int64_t bytes, QEMUIOVector *qiov,
>                                  BdrvRequestFlags flags);