Let's call this qemuMigrationSrcCancelUnattended as the function is
supposed to be used when no other thread is watching the migration.
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
src/qemu/qemu_migration.c | 2 +-
src/qemu/qemu_migration.h | 2 +-
src/qemu/qemu_process.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index b3b25d78b4..67d83ca743 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -6943,7 +6943,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
int
-qemuMigrationSrcCancel(virDomainObj *vm)
+qemuMigrationSrcCancelUnattended(virDomainObj *vm)
{
qemuDomainObjPrivate *priv = vm->privateData;
bool storage = false;
diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
index d518889c19..bbc71d118d 100644
--- a/src/qemu/qemu_migration.h
+++ b/src/qemu/qemu_migration.h
@@ -241,7 +241,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver,
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
int
-qemuMigrationSrcCancel(virDomainObj *vm);
+qemuMigrationSrcCancelUnattended(virDomainObj *vm);
int
qemuMigrationAnyFetchStats(virDomainObj *vm,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 32f03ff79a..4e8daf83fe 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3537,7 +3537,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriver *driver,
*/
VIR_DEBUG("Cancelling unfinished migration of domain %s",
vm->def->name);
- if (qemuMigrationSrcCancel(vm) < 0) {
+ if (qemuMigrationSrcCancelUnattended(vm) < 0) {
VIR_WARN("Could not cancel ongoing migration of domain %s",
vm->def->name);
}
--
2.37.2
On Thu, Sep 01, 2022 at 14:47:39 +0200, Jiri Denemark wrote:
> Let's call this qemuMigrationSrcCancelUnattended as the function is
> supposed to be used when no other thread is watching the migration.
>
> Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
> ---
> src/qemu/qemu_migration.c | 2 +-
> src/qemu/qemu_migration.h | 2 +-
> src/qemu/qemu_process.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index b3b25d78b4..67d83ca743 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -6943,7 +6943,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm,
>
>
> int
Maybe you should also add a function description here so that it's
obvious. Or at least that the docs don't stay in the commit message
only.
> -qemuMigrationSrcCancel(virDomainObj *vm)
> +qemuMigrationSrcCancelUnattended(virDomainObj *vm)
> {
> qemuDomainObjPrivate *priv = vm->privateData;
> bool storage = false;
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
© 2016 - 2026 Red Hat, Inc.