Re: [PATCH v2 18/26] quorum: add missing coroutine_fn annotations

[Alberto Faria]

On Mon, May 9, 2022 at 11:54 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  block/quorum.c | 35 ++++++++++++++++++-----------------
>  1 file changed, 18 insertions(+), 17 deletions(-)
>
> diff --git a/block/quorum.c b/block/quorum.c
> index f33f30d36b..5ff69d7443 100644
> --- a/block/quorum.c
> +++ b/block/quorum.c
> @@ -161,11 +161,10 @@ static bool quorum_64bits_compare(QuorumVoteValue *a, 
> QuorumVoteValue *b)
>      return a->l == b->l;
>  }
>
> -static QuorumAIOCB *quorum_aio_get(BlockDriverState *bs,
> -                                   QEMUIOVector *qiov,
> -                                   uint64_t offset,
> -                                   uint64_t bytes,
> -                                   int flags)
> +static QuorumAIOCB *coroutine_fn quorum_aio_get(BlockDriverState *bs,
> +                                                QEMUIOVector *qiov,
> +                                                uint64_t offset, uint64_t 
> bytes,
> +                                                int flags)
>  {
>      BDRVQuorumState *s = bs->opaque;
>      QuorumAIOCB *acb = g_new(QuorumAIOCB, 1);
> @@ -273,7 +272,7 @@ static void quorum_report_bad_versions(BDRVQuorumState *s,
>      }
>  }
>
> -static void quorum_rewrite_entry(void *opaque)
> +static void coroutine_fn quorum_rewrite_entry(void *opaque)
>  {
>      QuorumCo *co = opaque;
>      QuorumAIOCB *acb = co->acb;
> @@ -574,7 +573,7 @@ free_exit:
>      quorum_free_vote_list(&acb->votes);
>  }
>
> -static void read_quorum_children_entry(void *opaque)
> +static void coroutine_fn read_quorum_children_entry(void *opaque)
>  {
>      QuorumCo *co = opaque;
>      QuorumAIOCB *acb = co->acb;
> @@ -602,7 +601,7 @@ static void read_quorum_children_entry(void *opaque)
>      }
>  }
>
> -static int read_quorum_children(QuorumAIOCB *acb)
> +static int coroutine_fn read_quorum_children(QuorumAIOCB *acb)
>  {
>      BDRVQuorumState *s = acb->bs->opaque;
>      int i;
> @@ -643,7 +642,7 @@ static int read_quorum_children(QuorumAIOCB *acb)
>      return acb->vote_ret;
>  }
>
> -static int read_fifo_child(QuorumAIOCB *acb)
> +static int coroutine_fn read_fifo_child(QuorumAIOCB *acb)

There's a prototype further above that may be worth marking as coroutine_fn too.

>  {
>      BDRVQuorumState *s = acb->bs->opaque;
>      int n, ret;
> @@ -664,8 +663,9 @@ static int read_fifo_child(QuorumAIOCB *acb)
>      return ret;
>  }
>
> -static int quorum_co_preadv(BlockDriverState *bs, int64_t offset, int64_t 
> bytes,
> -                            QEMUIOVector *qiov, BdrvRequestFlags flags)
> +static int coroutine_fn quorum_co_preadv(BlockDriverState *bs,
> +                                         int64_t offset, int64_t bytes,
> +                                         QEMUIOVector *qiov, 
> BdrvRequestFlags flags)

Overly long line.

>  {
>      BDRVQuorumState *s = bs->opaque;
>      QuorumAIOCB *acb = quorum_aio_get(bs, qiov, offset, bytes, flags);
> @@ -684,7 +684,7 @@ static int quorum_co_preadv(BlockDriverState *bs, int64_t 
> offset, int64_t bytes,
>      return ret;
>  }
>
> -static void write_quorum_entry(void *opaque)
> +static void coroutine_fn write_quorum_entry(void *opaque)
>  {
>      QuorumCo *co = opaque;
>      QuorumAIOCB *acb = co->acb;
> @@ -715,9 +715,9 @@ static void write_quorum_entry(void *opaque)
>      }
>  }
>
> -static int quorum_co_pwritev(BlockDriverState *bs, int64_t offset,
> -                             int64_t bytes, QEMUIOVector *qiov,
> -                             BdrvRequestFlags flags)
> +static int coroutine_fn quorum_co_pwritev(BlockDriverState *bs, int64_t 
> offset,
> +                                          int64_t bytes, QEMUIOVector *qiov,
> +                                          BdrvRequestFlags flags)
>  {
>      BDRVQuorumState *s = bs->opaque;
>      QuorumAIOCB *acb = quorum_aio_get(bs, qiov, offset, bytes, flags);
> @@ -746,8 +746,9 @@ static int quorum_co_pwritev(BlockDriverState *bs, 
> int64_t offset,
>      return ret;
>  }
>
> -static int quorum_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,
> -                                   int64_t bytes, BdrvRequestFlags flags)
> +static int coroutine_fn quorum_co_pwrite_zeroes(BlockDriverState *bs,
> +                                                int64_t offset, int64_t 
> bytes,
> +                                                BdrvRequestFlags flags)
>
>  {
>      return quorum_co_pwritev(bs, offset, bytes, NULL,
> --
> 2.35.1

Reviewed-by: Alberto Faria <afaria@redhat.com>