[libvirt] [PATCH] Fix warning about unsupported cookie flags in QEMU driver

[Michal Privoznik]

On 03.05.2013 12:10, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange at redhat.com>
> 
> The QEMU migration code unconditionally sets the 'persistent'
> cookie flag on the source host. The dest host, however, only
> allows it during parsing if VIR_MIGRATE_PERSIST_DEST was
> set. Make the source host only set it if this flag is
> present.
> 
> Signed-off-by: Daniel P. Berrange <berrange at redhat.com>
> ---
>  src/qemu/qemu_migration.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 0732614..d50099c 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c
> @@ -2941,8 +2941,9 @@ cleanup:
>          VIR_FORCE_CLOSE(fd);
>      }
>  
> -    cookieFlags |= (QEMU_MIGRATION_COOKIE_PERSISTENT |
> -                    QEMU_MIGRATION_COOKIE_NETWORK);
> +    cookieFlags |= QEMU_MIGRATION_COOKIE_NETWORK;
> +    if (flags & VIR_MIGRATE_PERSIST_DEST)
> +        cookieFlags |= QEMU_MIGRATION_COOKIE_PERSISTENT;
>      if (ret == 0 &&
>          qemuMigrationBakeCookie(mig, driver, vm, cookieout,
>                                  cookieoutlen, cookieFlags) < 0) {
> 

ACK

Michal