[libvirt PATCH 64/80] qemu: Rename qemuMigrationSrcCleanup
The function is now called qemuMigrationAnyConnectionClosed to make it
clear it is supposed to handle broken connection during migration. It
will soon be used on both sides of migration so the "Src" part was changed
to "Any" to avoid renaming the function twice in a row.
The original *Cleanup name could easily be confused with cleanup
callbacks called when a domain is destroyed.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_migration.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 07b8c99343..d44d5c6ec4 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2336,9 +2336,9 @@ qemuMigrationDstRun(virQEMUDriver *driver,
* qemuDomainMigratePerform3 and qemuDomainMigrateConfirm3.
*/
static void
-qemuMigrationSrcCleanup(virDomainObj *vm,
- virConnectPtr conn,
- void *opaque)
+qemuMigrationAnyConnectionClosed(virDomainObj *vm,
+ virConnectPtr conn,
+ void *opaque)
{
virQEMUDriver *driver = opaque;
qemuDomainObjPrivate *priv = vm->privateData;
@@ -2836,13 +2836,13 @@ qemuMigrationSrcBeginResumePhase(virConnectPtr conn,
return NULL;
virCloseCallbacksUnset(driver->closeCallbacks, vm,
- qemuMigrationSrcCleanup);
+ qemuMigrationAnyConnectionClosed);
qemuDomainCleanupRemove(vm, qemuProcessCleanupMigrationJob);
xml = qemuMigrationSrcBeginResume(driver, vm, xmlin, cookieout, cookieoutlen,
flags);
if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn,
- qemuMigrationSrcCleanup) < 0)
+ qemuMigrationAnyConnectionClosed) < 0)
g_clear_pointer(&xml, g_free);
if (!xml)
@@ -2921,7 +2921,7 @@ qemuMigrationSrcBegin(virConnectPtr conn,
* place.
*/
if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn,
- qemuMigrationSrcCleanup) < 0) {
+ qemuMigrationAnyConnectionClosed) < 0) {
VIR_FREE(xml);
goto endjob;
}
@@ -4001,7 +4001,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver,
goto cleanup;
virCloseCallbacksUnset(driver->closeCallbacks, vm,
- qemuMigrationSrcCleanup);
+ qemuMigrationAnyConnectionClosed);
qemuDomainCleanupRemove(vm, qemuProcessCleanupMigrationJob);
ret = qemuMigrationSrcConfirmPhase(driver, vm,
@@ -5977,7 +5977,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver,
return -1;
virCloseCallbacksUnset(driver->closeCallbacks, vm,
- qemuMigrationSrcCleanup);
+ qemuMigrationAnyConnectionClosed);
qemuDomainCleanupRemove(vm, qemuProcessCleanupMigrationJob);
ret = qemuMigrationSrcPerformNative(driver, vm, NULL, uri,
@@ -5986,7 +5986,7 @@ qemuMigrationSrcPerformResume(virQEMUDriver *driver,
0, NULL, NULL, 0, NULL, NULL, NULL);
if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn,
- qemuMigrationSrcCleanup) < 0)
+ qemuMigrationAnyConnectionClosed) < 0)
ret = -1;
if (ret < 0)
@@ -6042,7 +6042,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
goto cleanup;
virCloseCallbacksUnset(driver->closeCallbacks, vm,
- qemuMigrationSrcCleanup);
+ qemuMigrationAnyConnectionClosed);
if (qemuMigrationSrcPerformNative(driver, vm, persist_xml, uri, cookiein,
cookieinlen,
cookieout, cookieoutlen,
@@ -6051,7 +6051,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver,
goto cleanup;
if (virCloseCallbacksSet(driver->closeCallbacks, vm, conn,
- qemuMigrationSrcCleanup) < 0)
+ qemuMigrationAnyConnectionClosed) < 0)
goto cleanup;
ignore_value(qemuMigrationJobSetPhase(vm, QEMU_MIGRATION_PHASE_PERFORM3_DONE));
--
2.35.1