From d24586ede83472f850d1a0c520d482ac5f908696 Mon Sep 17 00:00:00 2001 Message-Id: From: Jiri Denemark Date: Thu, 30 Jun 2022 12:51:55 +0200 Subject: [PATCH] qemu_migration: Pass migParams to qemuMigrationSrcResume So the we can apply selected migration parameters even when resuming post-copy migration. Signed-off-by: Jiri Denemark Reviewed-by: Michal Privoznik (cherry picked from commit 8c335b5530194dbcef719a4d88c89b8723b831a5) https://bugzilla.redhat.com/show_bug.cgi?id=2111070 Signed-off-by: Jiri Denemark --- src/qemu/qemu_migration.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8cbd73a809..285a49c5ff 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5097,6 +5097,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, static int qemuMigrationSrcResume(virDomainObj *vm, + qemuMigrationParams *migParams G_GNUC_UNUSED, const char *cookiein, int cookieinlen, char **cookieout, @@ -5229,7 +5230,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, @@ -6124,6 +6125,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver, virConnectPtr conn, virDomainObj *vm, const char *uri, + qemuMigrationParams *migParams, const char *cookiein, int cookieinlen, char **cookieout, @@ -6148,7 +6150,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) @@ -6188,7 +6190,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); } -- 2.35.1