]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu_migration: Pass migParams to qemuMigrationSrcResume
authorJiri Denemark <jdenemar@redhat.com>
Thu, 30 Jun 2022 10:51:55 +0000 (12:51 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 1 Jul 2022 09:28:34 +0000 (11:28 +0200)
So the we can apply selected migration parameters even when resuming
post-copy migration.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_migration.c

index 4ca2f8b600d406b42ec3c540e5a9848211c31c3c..0c41af86e7d53c1ff08736c004204113c70e5ed5 100644 (file)
@@ -5051,6 +5051,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
 
 static int
 qemuMigrationSrcResume(virDomainObj *vm,
+                       qemuMigrationParams *migParams G_GNUC_UNUSED,
                        const char *cookiein,
                        int cookieinlen,
                        char **cookieout,
@@ -5183,7 +5184,7 @@ qemuMigrationSrcPerformNative(virQEMUDriver *driver,
     spec.fwdType = MIGRATION_FWD_DIRECT;
 
     if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
-        ret = qemuMigrationSrcResume(vm, cookiein, cookieinlen,
+        ret = qemuMigrationSrcResume(vm, migParams, cookiein, cookieinlen,
                                      cookieout, cookieoutlen, &spec);
     } else {
         ret = qemuMigrationSrcRun(driver, vm, persist_xml, cookiein, cookieinlen,
@@ -6078,6 +6079,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver,
                               virConnectPtr conn,
                               virDomainObj *vm,
                               const char *uri,
+                              qemuMigrationParams *migParams,
                               const char *cookiein,
                               int cookieinlen,
                               char **cookieout,
@@ -6102,7 +6104,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver,
     ret = qemuMigrationSrcPerformNative(driver, vm, NULL, uri,
                                         cookiein, cookieinlen,
                                         cookieout, cookieoutlen, flags,
-                                        0, NULL, NULL, 0, NULL, NULL, NULL);
+                                        0, NULL, NULL, 0, NULL, migParams, NULL);
 
     if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn,
                              qemuMigrationAnyConnectionClosed) < 0)
@@ -6142,7 +6144,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
     int ret = -1;
 
     if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
-        return qemuMigrationSrcPerformResume(driver, conn, vm, uri,
+        return qemuMigrationSrcPerformResume(driver, conn, vm, uri, migParams,
                                              cookiein, cookieinlen,
                                              cookieout, cookieoutlen, flags);
     }