qemu: Fix warning in qemuMigrationDstPostcopyFailed

[libvirt PATCH] qemu: Fix warning in qemuMigrationDstPostcopyFailed

Posted by Jiri Denemark 1 year, 4 months ago

The function is called even if QEMU reports migration as
postcopy-paused, i.e., it's not migrating anymore. And while changing
the warning, we can drop the part about unattended migration to make the
warning shorter and consistent with qemuMigrationSrcPostcopyFailed.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/qemu/qemu_migration.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 81bb08c029..2e87db883e 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1704,9 +1704,8 @@ qemuMigrationDstPostcopyFailed(virDomainObj *vm)
         reason == VIR_DOMAIN_RUNNING_POSTCOPY_FAILED)
         return;
 
-    VIR_WARN("Migration protocol failed during incoming migration of domain "
-             "%s, but QEMU keeps migrating; leaving the domain running, the "
-             "migration will be handled as unattended", vm->def->name);
+    VIR_WARN("Incoming migration of domain %s failed during post-copy; "
+             "leaving the domain running", vm->def->name);
 
     virDomainObjSetState(vm, VIR_DOMAIN_RUNNING,
                          VIR_DOMAIN_RUNNING_POSTCOPY_FAILED);
-- 
2.39.0

Re: [libvirt PATCH] qemu: Fix warning in qemuMigrationDstPostcopyFailed

Posted by Peter Krempa 1 year, 4 months ago

On Tue, Dec 13, 2022 at 14:22:40 +0100, Jiri Denemark wrote:
> The function is called even if QEMU reports migration as
> postcopy-paused, i.e., it's not migrating anymore. And while changing
> the warning, we can drop the part about unattended migration to make the
> warning shorter and consistent with qemuMigrationSrcPostcopyFailed.
> 
> Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
> ---
>  src/qemu/qemu_migration.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 81bb08c029..2e87db883e 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -1704,9 +1704,8 @@ qemuMigrationDstPostcopyFailed(virDomainObj *vm)
>          reason == VIR_DOMAIN_RUNNING_POSTCOPY_FAILED)
>          return;
>  
> -    VIR_WARN("Migration protocol failed during incoming migration of domain "
> -             "%s, but QEMU keeps migrating; leaving the domain running, the "
> -             "migration will be handled as unattended", vm->def->name);
> +    VIR_WARN("Incoming migration of domain %s failed during post-copy; "
> +             "leaving the domain running", vm->def->name);

Put the '%s' in quotes.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>