From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 5 Nov 2015 14:20:21 +0000 (+0100)
Subject: qemu: migration: Properly parse memory hotplug migration flag
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f59808b724f99d43d042600455f55428a88a1ad9;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: migration: Properly parse memory hotplug migration flag

Since the flag was not enabled when 'eating' the migration cookie,
libvirt reported a bogus error when memory hotplug was enabled:

 unsupported migration cookie feature memory-hotplug

The error was ignored though due to a bug in the code so it slipped
through testing.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1278404
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 2abf2eea8..a53a53369 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -3387,7 +3387,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
 
     if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen,
                                        QEMU_MIGRATION_COOKIE_LOCKSTATE |
-                                       QEMU_MIGRATION_COOKIE_NBD)))
+                                       QEMU_MIGRATION_COOKIE_NBD |
+                                       QEMU_MIGRATION_COOKIE_MEMORY_HOTPLUG)))
         goto cleanup;
 
     if (STREQ_NULLABLE(protocol, "rdma") &&