[libvirt] [PATCH] qemu: Break endless loop if qemuMigrationResetTLS fails
John Ferlan
jferlan at redhat.com
Tue Apr 4 11:53:55 UTC 2017
On 04/04/2017 06:48 AM, Jiri Denemark wrote:
> Jumping to "endjob" label from a code after this label is not a very
> good idea.
>
> Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
> ---
> src/qemu/qemu_migration.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
D'oh... Not sure if it's too late, but wrap in ignore_value(); similar
to qemuMigrationPrepareAny failure
John
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 87d7dcd0c..7f00a3d93 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -5351,9 +5351,7 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
> QEMU_ASYNC_JOB_MIGRATION_IN);
> }
>
> - if (qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN,
> - NULL, NULL) < 0)
> - goto endjob;
> + qemuMigrationResetTLS(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN, NULL, NULL);
>
> qemuMigrationJobFinish(driver, vm);
> if (!virDomainObjIsActive(vm))
>
More information about the libvir-list
mailing list