aboutsummaryrefslogtreecommitdiff
path: root/blockjob.c
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2018-05-08 11:55:30 +0200
committerKevin Wolf <kwolf@redhat.com>2018-05-15 16:11:49 +0200
commit37aa19b63c46d933f1e4ea944cfccee54e2caf4a (patch)
tree3b1a99257a2f70fd6703fcaad67e075598daf131 /blockjob.c
parentab9ba614556ac5b0f8d96b99e0dba19f1e28d6c2 (diff)
downloadqemu-37aa19b63c46d933f1e4ea944cfccee54e2caf4a.zip
qemu-37aa19b63c46d933f1e4ea944cfccee54e2caf4a.tar.gz
qemu-37aa19b63c46d933f1e4ea944cfccee54e2caf4a.tar.bz2
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>
Diffstat (limited to 'blockjob.c')
-rw-r--r--blockjob.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/blockjob.c b/blockjob.c
index 0b9b336..0ebc5ab 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;
}