From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 13 Jun 2024 14:19:37 +0000 (+0200)
Subject: qemu: migration: Inline 'qemuMigrationDstFinishResume()'
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9243e87820cdcc54653fa1b346ecef910ac29e12;p=libvirt.git

qemu: migration: Inline 'qemuMigrationDstFinishResume()'

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>
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 0d8d3fd94f..3524915e9d 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -2098,7 +2098,7 @@ qemuMigrationDstWaitForCompletion(virDomainObj *vm,
     unsigned int flags = 0;
     int rv;
 
-    VIR_DEBUG("Waiting for incoming migration to complete");
+    VIR_DEBUG("Waiting for incoming migration to complete (vm='%p')", vm);
 
     if (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
 qemuMigrationDstFinishActive(virQEMUDriver *driver,
                              virConnectPtr dconn,
@@ -6753,7 +6738,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver,
     }
 
     if (flags & VIR_MIGRATE_POSTCOPY_RESUME) {
-        rc = qemuMigrationDstFinishResume(vm);
+        rc = qemuMigrationDstWaitForCompletion(vm, VIR_ASYNC_JOB_MIGRATION_IN, false);
         inPostCopy = true;
     } else {
         rc = qemuMigrationDstFinishFresh(driver, vm, mig, flags, v3proto,