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@xxxxxxxxxx>
Reviewed-by: Peter Krempa <pkrempa@xxxxxxxxxx>
Reviewed-by: Pavel Hrdina <phrdina@xxxxxxxxxx>
---
Notes:
Version 2:
- no change
src/qemu/qemu_migration.c | 39 +++++++++++++++++++++++++++++----------
1 file changed, 29 insertions(+), 10 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 72f22f09e4..01e47e46cc 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -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
* domain.
@@ -5998,16 +6024,9 @@ qemuMigrationDstFinish(virQEMUDriver *driver,
goto error;
if (flags & VIR_MIGRATE_OFFLINE) {
- if (retcode == 0 &&
- qemuMigrationDstPersist(driver, vm, mig, false) == 0) {
- 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");
+ if (retcode == 0) {
+ dom = qemuMigrationDstFinishOffline(driver, dconn, vm, mig,
+ cookieout, cookieoutlen);
}
qemuMigrationJobFinish(vm);
--
2.35.1
