From 848a08bc9450ff0e15d72945c2493d9483ce0301 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 3 May 2013 10:55:49 +0100 Subject: [PATCH] Fix warning about unsupported cookie flags in QEMU driver 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 --- 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 0732614f76..d50099cd7f 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) { -- 2.47.2