From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 10 May 2022 13:20:25 +0000 (+0200)
Subject: qemu: Pass qemuDomainJobObj to qemuMigrationDstComplete
X-Git-Tag: v8.5.0-rc1~162
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc9f385a1d00df240e077ce6db5aa4b91a26cd83;p=thirdparty%2Flibvirt.git

qemu: Pass qemuDomainJobObj to qemuMigrationDstComplete

When reconnecting to an active domain we need to use a different job
structure than the one referenced from the VM object.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 331386663e..d0ce17b9e4 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -5773,10 +5773,11 @@ void
 qemuMigrationDstComplete(virQEMUDriver *driver,
                          virDomainObj *vm,
                          bool inPostCopy,
-                         virDomainAsyncJob asyncJob)
+                         virDomainAsyncJob asyncJob,
+                         qemuDomainJobObj *job)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
-    qemuDomainJobPrivate *jobPriv = priv->job.privateData;
+    qemuDomainJobPrivate *jobPriv = job->privateData;
     virObjectEvent *event;
 
     if (inPostCopy) {
@@ -5817,10 +5818,10 @@ qemuMigrationDstComplete(virQEMUDriver *driver,
      * is obsolete anyway.
      */
     if (inPostCopy)
-        g_clear_pointer(&priv->job.completed, virDomainJobDataFree);
+        g_clear_pointer(&job->completed, virDomainJobDataFree);
 
     qemuMigrationParamsReset(driver, vm, asyncJob, jobPriv->migParams,
-                             priv->job.apiFlags);
+                             job->apiFlags);
 
     virPortAllocatorRelease(priv->migrationPort);
     priv->migrationPort = 0;
@@ -6052,7 +6053,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
         VIR_WARN("Unable to encode migration cookie");
 
     qemuMigrationDstComplete(driver, vm, inPostCopy,
-                             VIR_ASYNC_JOB_MIGRATION_IN);
+                             VIR_ASYNC_JOB_MIGRATION_IN, &priv->job);
 
     return dom;
 
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index 1d6051859b..c099cf99cf 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -195,7 +195,8 @@ void
 qemuMigrationDstComplete(virQEMUDriver *driver,
                          virDomainObj *vm,
                          bool inPostCopy,
-                         virDomainAsyncJob asyncJob);
+                         virDomainAsyncJob asyncJob,
+                         qemuDomainJobObj *job);
 
 int
 qemuMigrationSrcConfirm(virQEMUDriver *driver,