|
 |
38f2fd |
From cc29e312925235aeab6aba6afec5ff357e39155a Mon Sep 17 00:00:00 2001
|
|
|
38f2fd |
Message-Id: <cc29e312925235aeab6aba6afec5ff357e39155a@dist-git>
|
|
|
38f2fd |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
38f2fd |
Date: Thu, 12 Nov 2015 07:45:26 +0100
|
|
|
38f2fd |
Subject: [PATCH] qemu: migration: Properly parse memory hotplug migration flag
|
|
|
38f2fd |
|
|
|
38f2fd |
https://bugzilla.redhat.com/show_bug.cgi?id=1280419 [7.2.z]
|
|
|
38f2fd |
|
|
|
38f2fd |
Since the flag was not enabled when 'eating' the migration cookie,
|
|
|
38f2fd |
libvirt reported a bogus error when memory hotplug was enabled:
|
|
|
38f2fd |
|
|
|
38f2fd |
unsupported migration cookie feature memory-hotplug
|
|
|
38f2fd |
|
|
|
38f2fd |
The error was ignored though due to a bug in the code so it slipped
|
|
|
38f2fd |
through testing.
|
|
|
38f2fd |
|
|
|
38f2fd |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1278404
|
|
|
38f2fd |
(cherry picked from commit f59808b724f99d43d042600455f55428a88a1ad9)
|
|
|
38f2fd |
|
|
|
38f2fd |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
38f2fd |
---
|
|
|
38f2fd |
src/qemu/qemu_migration.c | 3 ++-
|
|
|
38f2fd |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
38f2fd |
|
|
|
38f2fd |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
38f2fd |
index d3e024e..8074156 100644
|
|
|
38f2fd |
--- a/src/qemu/qemu_migration.c
|
|
|
38f2fd |
+++ b/src/qemu/qemu_migration.c
|
|
|
38f2fd |
@@ -3350,7 +3350,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
|
|
|
38f2fd |
|
|
|
38f2fd |
if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen,
|
|
|
38f2fd |
QEMU_MIGRATION_COOKIE_LOCKSTATE |
|
|
|
38f2fd |
- QEMU_MIGRATION_COOKIE_NBD)))
|
|
|
38f2fd |
+ QEMU_MIGRATION_COOKIE_NBD |
|
|
|
38f2fd |
+ QEMU_MIGRATION_COOKIE_MEMORY_HOTPLUG)))
|
|
|
38f2fd |
goto cleanup;
|
|
|
38f2fd |
|
|
|
38f2fd |
if (STREQ_NULLABLE(protocol, "rdma") &&
|
|
|
38f2fd |
--
|
|
|
38f2fd |
2.6.3
|
|
|
38f2fd |
|