External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 20:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Introduce qemuMigrationDstFinishOffline

Browse Source 
Refactors qemuMigrationDstFinish by moving some parts to a dedicated
function for easier introduction of postcopy resume code without
duplicating common parts of the Finish phase. The goal is to have the
following call graph:

    - qemuMigrationDstFinish
        - qemuMigrationDstFinishOffline
        - qemuMigrationDstFinishActive
            - qemuMigrationDstFinishFresh
            - qemuMigrationDstFinishResume

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Jiri Denemark 2022-05-17 14:19:12 +02:00
parent 8ede853a9f
commit 71951e9869
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/qemu/qemu_migration.c
View File

@ -5808,6 +5808,32 @@ qemuMigrationDstComplete(virQEMUDriver *driver,
} }
static virDomainPtr
qemuMigrationDstFinishOffline(virQEMUDriver *driver,
virConnectPtr dconn,
virDomainObj *vm,
qemuMigrationCookie *mig,
char **cookieout,
int *cookieoutlen)
{
virDomainPtr dom = NULL;
if (qemuMigrationDstPersist(driver, vm, mig, false) < 0)
return NULL;
dom = virGetDomain(dconn, vm->def->name, vm->def->uuid, -1);
if (dom &&
qemuMigrationCookieFormat(mig, driver, vm,
QEMU_MIGRATION_DESTINATION,
cookieout, cookieoutlen,
QEMU_MIGRATION_COOKIE_STATS) < 0)
VIR_WARN("Unable to encode migration cookie");
return dom;
}
/* /*
* Perform Finish phase of a fresh (i.e., not recovery) migration of an active * Perform Finish phase of a fresh (i.e., not recovery) migration of an active
* domain. * domain.
@ -5998,16 +6024,9 @@ qemuMigrationDstFinish(virQEMUDriver *driver,
goto error; goto error;
if (flags & VIR_MIGRATE_OFFLINE) { if (flags & VIR_MIGRATE_OFFLINE) {
if (retcode == 0 && if (retcode == 0) {
qemuMigrationDstPersist(driver, vm, mig, false) == 0) { dom = qemuMigrationDstFinishOffline(driver, dconn, vm, mig,
dom = virGetDomain(dconn, vm->def->name, vm->def->uuid, -1); cookieout, cookieoutlen);
if (dom &&
qemuMigrationCookieFormat(mig, driver, vm,
QEMU_MIGRATION_DESTINATION,
cookieout, cookieoutlen,
QEMU_MIGRATION_COOKIE_STATS) < 0)
VIR_WARN("Unable to encode migration cookie");
} }
qemuMigrationJobFinish(vm); qemuMigrationJobFinish(vm);