NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: migration: Inline 'qemuMigrationDstFinishResume()'

Browse Source 
The function is a pointless wrapper on top of
qemuMigrationDstWaitForCompletion.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2024-06-13 16:19:37 +02:00
parent a52e125d56
commit 9243e87820
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/qemu/qemu_migration.c
View File

@ -2098,7 +2098,7 @@ qemuMigrationDstWaitForCompletion(virDomainObj *vm,
unsigned int flags = 0; unsigned int flags = 0;
int rv; int rv;
VIR_DEBUG("Waiting for incoming migration to complete"); VIR_DEBUG("Waiting for incoming migration to complete (vm='%p')", vm);
if (postcopy) if (postcopy)
flags = QEMU_MIGRATION_COMPLETED_POSTCOPY; flags = QEMU_MIGRATION_COMPLETED_POSTCOPY;
@ -6689,21 +6689,6 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver,
} }
static int
qemuMigrationDstFinishResume(virDomainObj *vm)
{
VIR_DEBUG("vm=%p", vm);
if (qemuMigrationDstWaitForCompletion(vm,
VIR_ASYNC_JOB_MIGRATION_IN,
false) < 0) {
return -1;
}
return 0;
}
static virDomainPtr static virDomainPtr
qemuMigrationDstFinishActive(virQEMUDriver *driver, qemuMigrationDstFinishActive(virQEMUDriver *driver,
virConnectPtr dconn, virConnectPtr dconn,
@ -6753,7 +6738,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
} }
if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
rc = qemuMigrationDstFinishResume(vm); rc = qemuMigrationDstWaitForCompletion(vm, VIR_ASYNC_JOB_MIGRATION_IN, false);
inPostCopy = true; inPostCopy = true;
} else { } else {
rc = qemuMigrationDstFinishFresh(driver, vm, mig, flags, v3proto, rc = qemuMigrationDstFinishFresh(driver, vm, mig, flags, v3proto,