]> git.proxmox.com Git - mirror_qemu.git/commit
blockjob: Fix assertion in block_job_finalize()
authorKevin Wolf <kwolf@redhat.com>
Tue, 8 May 2018 09:55:30 +0000 (11:55 +0200)
committerKevin Wolf <kwolf@redhat.com>
Tue, 15 May 2018 14:11:49 +0000 (16:11 +0200)
commit37aa19b63c46d933f1e4ea944cfccee54e2caf4a
tree3b1a99257a2f70fd6703fcaad67e075598daf131
parentab9ba614556ac5b0f8d96b99e0dba19f1e28d6c2
blockjob: Fix assertion in block_job_finalize()

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: qemu-stable@nongnu.org
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
blockjob.c