External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-09 06:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Implement VIR_MIGRATE_POSTCOPY_RESUME for Confirm phase

Browse Source 
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-10 15:20:25 +02:00
parent f2a19b4cd0
commit 491c9eff6c
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/qemu/qemu_migration.c
View File

@ -3777,15 +3777,19 @@ qemuMigrationSrcConfirmPhase(virQEMUDriver *driver,
virCheckFlags(QEMU_MIGRATION_FLAGS, -1); virCheckFlags(QEMU_MIGRATION_FLAGS, -1);
/* Keep the original migration phase in case post-copy failed as the job if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
* will stay active even though migration API finishes with an error. phase = QEMU_MIGRATION_PHASE_CONFIRM_RESUME;
*/ } else if (virDomainObjIsFailedPostcopy(vm)) {
if (virDomainObjIsFailedPostcopy(vm)) /* Keep the original migration phase in case post-copy failed as the
* job will stay active even though migration API finishes with an
* error.
*/
phase = priv->job.phase; phase = priv->job.phase;
else if (retcode == 0) } else if (retcode == 0) {
phase = QEMU_MIGRATION_PHASE_CONFIRM3; phase = QEMU_MIGRATION_PHASE_CONFIRM3;
else } else {
phase = QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED; phase = QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED;
}
if (qemuMigrationJobStartPhase(vm, phase) < 0) if (qemuMigrationJobStartPhase(vm, phase) < 0)
return -1; return -1;
@ -3860,18 +3864,28 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver,
qemuDomainObjPrivate *priv = vm->privateData; qemuDomainObjPrivate *priv = vm->privateData;
int ret = -1; int ret = -1;
if (!qemuMigrationJobIsActive(vm, VIR_ASYNC_JOB_MIGRATION_OUT)) VIR_DEBUG("vm=%p, flags=0x%x, cancelled=%d", vm, flags, cancelled);
goto cleanup;
/* Keep the original migration phase in case post-copy failed as the job if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
* will stay active even though migration API finishes with an error. if (!qemuMigrationAnyCanResume(vm, VIR_ASYNC_JOB_MIGRATION_OUT, flags,
*/ QEMU_MIGRATION_PHASE_PERFORM_RESUME))
if (virDomainObjIsFailedPostcopy(vm)) goto cleanup;
phase = priv->job.phase; phase = QEMU_MIGRATION_PHASE_CONFIRM_RESUME;
else if (cancelled) } else {
phase = QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED; if (!qemuMigrationJobIsActive(vm, VIR_ASYNC_JOB_MIGRATION_OUT))
else goto cleanup;
phase = QEMU_MIGRATION_PHASE_CONFIRM3;
/* Keep the original migration phase in case post-copy failed as the
* job will stay active even though migration API finishes with an
* error.
*/
if (virDomainObjIsFailedPostcopy(vm))
phase = priv->job.phase;
else if (cancelled)
phase = QEMU_MIGRATION_PHASE_CONFIRM3_CANCELLED;
else
phase = QEMU_MIGRATION_PHASE_CONFIRM3;
}
if (qemuMigrationJobStartPhase(vm, phase) < 0) if (qemuMigrationJobStartPhase(vm, phase) < 0)
goto cleanup; goto cleanup;