Re: [Qemu-block] [PATCH 01/42] blockjob: Fix assertion in block_job_finalize()

[Eric Blake]

On 05/09/2018 11:25 AM, Kevin Wolf wrote:
> Every job gets a non-NULL job->txn on creation, but it doesn't
> necessarily keep it until it is decommissioned: Finalising a job removes
> it from its transaction. Therefore, calling 'blockdev-job-finalize' a
> second time on an already concluded job causes an assertion failure.
>
> Remove job->txn from the assertion in block_job_finalize() to fix this.
> block_job_do_finalize() still has the same assertion, but if a job is
> already removed from its transaction, block_job_apply_verb() will
> already error out before we run into that assertion.

CC: address@hidden

> Signed-off-by: Kevin Wolf <address@hidden>
> ---
>   blockjob.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <address@hidden>

> diff --git a/blockjob.c b/blockjob.c
> index 4de48166b2..b38ed7e265 100644
> --- a/blockjob.c
> +++ b/blockjob.c
> @@ -702,7 +702,7 @@ void block_job_complete(BlockJob *job, Error **errp)
>   
>   void block_job_finalize(BlockJob *job, Error **errp)
>   {
> -    assert(job && job->id && job->txn);
> +    assert(job && job->id);
>       if (block_job_apply_verb(job, BLOCK_JOB_VERB_FINALIZE, errp)) {
>           return;
>       }

--
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3266
Virtualization:  qemu.org | libvirt.org