External/libvirt
1
0
Fork 0
Code

qemu_migration: Pass migParams to qemuMigrationSrcResume

Browse Source 
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>
This commit is contained in:
Jiri Denemark 2022-06-30 12:51:55 +02:00
parent 184749691f
commit 8c335b5530
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_migration.c
View File

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