[libvirt] [PATCH] qemu: fix wrong remove guest cfg if migrate fail

Jiri Denemark jdenemar at redhat.com
Thu Jun 25 08:25:53 UTC 2015


On Thu, Jun 25, 2015 at 09:38:57 +0800, Luyao Huang wrote:
> If we get fail in qemuMigrationPrepareAny, we forget
> check if the vm is persistent then always call
> qemuDomainRemoveInactive to clean the inactive settings.
> Add a check to avoid this. This issue was introduce in
> commit 540c339.
> 
> Signed-off-by: Luyao Huang <lhuang at redhat.com>
> ---
>  src/qemu/qemu_migration.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 47d49cd..a57a177 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -3432,7 +3432,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
>          VIR_FREE(priv->origname);
>          virPortAllocatorRelease(driver->migrationPorts, priv->nbdPort);
>          priv->nbdPort = 0;
> -        qemuDomainRemoveInactive(driver, vm);
> +        if (!vm->persistent)
> +            qemuDomainRemoveInactive(driver, vm);
>      }
>      virDomainObjEndAPI(&vm);
>      if (event)

ACK.

I rewrote the commit message and pushed this patch, thanks.

Jirka




More information about the libvir-list mailing list