On Wed, May 31, 2017 at 11:43:27AM +0200, Paolo Bonzini wrote:
> diff --git a/block/qed.c b/block/qed.c
> index 83a0973cfb..990210cd9c 100644
> --- a/block/qed.c
> +++ b/block/qed.c

Does this belong in the next patch?

> @@ -351,7 +351,7 @@ static void bdrv_qed_attach_aio_context(BlockDriverState *bs,
>      }
>  }
>  
> -static void bdrv_qed_drain(BlockDriverState *bs)
> +static void coroutine_fn bdrv_qed_co_drain(BlockDriverState *bs)
>  {
>      BDRVQEDState *s = bs->opaque;
>  
> @@ -360,7 +360,7 @@ static void bdrv_qed_drain(BlockDriverState *bs)
>       */
>      if (s->need_check_timer && timer_pending(s->need_check_timer)) {
>          qed_cancel_need_check_timer(s);
> -        qed_need_check_timer_cb(s);
> +        qed_need_check_timer_entry(s);
>      }
>  }
>  
> @@ -1544,7 +1544,7 @@ static BlockDriver bdrv_qed = {
>      .bdrv_check               = bdrv_qed_check,
>      .bdrv_detach_aio_context  = bdrv_qed_detach_aio_context,
>      .bdrv_attach_aio_context  = bdrv_qed_attach_aio_context,
> -    .bdrv_drain               = bdrv_qed_drain,
> +    .bdrv_co_drain            = bdrv_qed_co_drain,
>  };
>  
>  static void bdrv_qed_init(void)