On 2018-05-09 18:26, Kevin Wolf wrote:
> This moves the logic that implements job transactions from BlockJob to
> Job.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  include/block/blockjob.h     |  54 ----------
>  include/block/blockjob_int.h |  10 --
>  include/qemu/job.h           |  71 +++++++++++--
>  blockdev.c                   |   6 +-
>  blockjob.c                   | 238 +------------------------------------------
>  job.c                        | 235 ++++++++++++++++++++++++++++++++++++++++--
>  tests/test-blockjob-txn.c    |  12 +--
>  tests/test-blockjob.c        |   2 +-
>  8 files changed, 304 insertions(+), 324 deletions(-)

[...]

> diff --git a/job.c b/job.c
> index 49dce57c9e..2d782859ac 100644
> --- a/job.c
> +++ b/job.c

[...]

> @@ -263,9 +353,10 @@ void job_event_completed(Job *job)
>      notifier_list_notify(&job->on_finalize_completed, job);
>  }
>  
> -void job_event_pending(Job *job)
> +static int job_event_pending(Job *job)
>  {
>      notifier_list_notify(&job->on_pending, job);
> +    return 0;
>  }
>  
>  void job_enter_cond(Job *job, bool(*fn)(Job *job))

On second thought, I don't know why this hunk is necessary.

Max