From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 11 Jan 2021 09:42:15 +0000 (+0100)
Subject: qemuBlockJobEventProcess: Always clear 'mirrorState' when a job finishes
X-Git-Tag: v7.0.0-rc2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=202d61db4870468a02817e64fefb5ede06b8a59a;p=thirdparty%2Flibvirt.git

qemuBlockJobEventProcess: Always clear 'mirrorState' when a job finishes

When a block job is terminated we should clear the 'mirrorState' and
'mirrorJob' variables so that stale values are not present prior to a
new job.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index 2a5a5e66f4..0d00dbc947 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -1691,6 +1691,10 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
     case QEMU_BLOCKJOB_STATE_FAILED:
     case QEMU_BLOCKJOB_STATE_CANCELLED:
     case QEMU_BLOCKJOB_STATE_CONCLUDED:
+        if (job->disk) {
+            job->disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
+            job->disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN;
+        }
         qemuBlockJobEventProcessConcluded(job, driver, vm, asyncJob);
         break;