]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: stop NBD server after successful migration
authorWeiwei Li <nuonuoli@tencent.com>
Tue, 4 Nov 2014 09:52:10 +0000 (10:52 +0100)
committerJán Tomko <jtomko@redhat.com>
Tue, 4 Nov 2014 09:54:53 +0000 (10:54 +0100)
In qemuMigrationFinish mig->nbd can not be initialized by
qemuMigrationEatCookie without the QEMU_MIGRATION_COOKIE_NBD flag.
That causes qemuMigrationStopNBDServer to return early without
stopping the NBD server properly.

Signed-off-by: Weiwei Li <nuonuoli@tencent.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_migration.c

index 13239ebe31015b42e1f83d0f2a77ec42985ca466..94a4cf6abe26642f96d2cd1120d76d9ca5ff8ab1 100644 (file)
@@ -4822,7 +4822,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
     VIR_FREE(priv->job.completed);
 
     cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK |
-                   QEMU_MIGRATION_COOKIE_STATS;
+                   QEMU_MIGRATION_COOKIE_STATS |
+                   QEMU_MIGRATION_COOKIE_NBD;
     if (flags & VIR_MIGRATE_PERSIST_DEST)
         cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT;