d665afae2a
A couple of fixes, including one which gives confidence we can submit to Factory finally. OBS-URL: https://build.opensuse.org/request/show/612290 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=410
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 1eb457c2de41008aca9873be0ba2e2635e1f9cf1 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Tue, 8 May 2018 11:55:30 +0200
|
|
Subject: [PATCH] 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>
|
|
(cherry picked from commit 37aa19b63c46d933f1e4ea944cfccee54e2caf4a)
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
blockjob.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
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;
|
|
}
|