|
 |
9119d9 |
From 8af0eae29dac349052a5d2cfd78198074a50af89 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <8af0eae29dac349052a5d2cfd78198074a50af89@dist-git>
|
|
|
9119d9 |
From: Weiwei Li <nuonuoli@tencent.com>
|
|
|
9119d9 |
Date: Tue, 4 Nov 2014 12:08:37 +0100
|
|
|
9119d9 |
Subject: [PATCH] qemu: stop NBD server after successful migration
|
|
|
9119d9 |
MIME-Version: 1.0
|
|
|
9119d9 |
Content-Type: text/plain; charset=UTF-8
|
|
|
9119d9 |
Content-Transfer-Encoding: 8bit
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1160212
|
|
|
9119d9 |
|
|
|
9119d9 |
In qemuMigrationFinish mig->nbd can not be initialized by
|
|
|
9119d9 |
qemuMigrationEatCookie without the QEMU_MIGRATION_COOKIE_NBD flag.
|
|
|
9119d9 |
That causes qemuMigrationStopNBDServer to return early without
|
|
|
9119d9 |
stopping the NBD server properly.
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Weiwei Li <nuonuoli@tencent.com>
|
|
|
9119d9 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9119d9 |
(cherry picked from commit c3012a023f2ae5763027cafc1cf2881a3c7c4b45)
|
|
|
9119d9 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/qemu/qemu_migration.c | 3 ++-
|
|
|
9119d9 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
9119d9 |
index 1998bc9..cc245f6 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_migration.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_migration.c
|
|
|
9119d9 |
@@ -4823,7 +4823,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
|
|
|
9119d9 |
VIR_FREE(priv->job.completed);
|
|
|
9119d9 |
|
|
|
9119d9 |
cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK |
|
|
|
9119d9 |
- QEMU_MIGRATION_COOKIE_STATS;
|
|
|
9119d9 |
+ QEMU_MIGRATION_COOKIE_STATS |
|
|
|
9119d9 |
+ QEMU_MIGRATION_COOKIE_NBD;
|
|
|
9119d9 |
if (flags & VIR_MIGRATE_PERSIST_DEST)
|
|
|
9119d9 |
cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT;
|
|
|
9119d9 |
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.3
|
|
|
9119d9 |
|