External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-23 20:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Fix migration from old libvirt

Browse Source 
Older libvirt versions send persistent XML in a migration cookie even
when VIR_MIGRATE_PERSIST_DEST flag is not used, but current libvirt
properly fails if the cookie contains unexpected flags. Thus migration
from old libvirt fails with

    internal error: Unsupported migration cookie feature persistent

unless VIR_MIGRATE_PERSIST_DEST flag is set.

https://bugzilla.redhat.com/show_bug.cgi?id=1320500

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Jiri Denemark 2016-07-18 13:17:28 +02:00
parent 6fd8a1e614
commit 338f772e92
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qemu/qemu_migration.c
View File

@ -6183,8 +6183,9 @@ qemuMigrationFinish(virQEMUDriverPtr driver,
cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK | cookie_flags = QEMU_MIGRATION_COOKIE_NETWORK |
QEMU_MIGRATION_COOKIE_STATS | QEMU_MIGRATION_COOKIE_STATS |
QEMU_MIGRATION_COOKIE_NBD; QEMU_MIGRATION_COOKIE_NBD;
if (flags & VIR_MIGRATE_PERSIST_DEST) /* Some older versions of libvirt always send persistent XML in the cookie
cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT; * even though VIR_MIGRATE_PERSIST_DEST was not used. */
cookie_flags |= QEMU_MIGRATION_COOKIE_PERSISTENT;
if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein,
cookieinlen, cookie_flags))) cookieinlen, cookie_flags)))