External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

qemu: Fix persistent migration of transient domains

Browse Source 
While fixing a bug with incorrectly freed memory in commit
v3.1.0-399-g5498aa29a, I accidentally broke persistent migration of
transient domains. Before adding qemuDomainDefCopy in the path, the code
just took NULL from vm->newDef and used it as the persistent def, which
resulted in no persistent XML being sent in the migration cookie. This
scenario is perfectly valid and the destination correctly handles it by
using the incoming live definition and storing it as the persistent one.

After the mentioned commit libvirtd would just segfault in the described
scenario.

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

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
(cherry picked from commit 59307fade86fb74db1f8f572433962233f7ac123)
This commit is contained in:
Jiri Denemark 2017-05-02 18:01:04 +02:00 committed by Cole Robinson
parent ce275361cc
commit 91ac0195f9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_migration.c
View File

@ -3620,15 +3620,15 @@ qemuMigrationRun(virQEMUDriverPtr driver,
if (flags & VIR_MIGRATE_PERSIST_DEST) {
if (persist_xml) {
persistDef = qemuMigrationPrepareDef(driver, persist_xml,
NULL, NULL);
} else {
persistDef = qemuDomainDefCopy(driver, vm->newDef,
VIR_DOMAIN_XML_SECURE |
VIR_DOMAIN_XML_MIGRATABLE);
if (!(persistDef = qemuMigrationPrepareDef(driver, persist_xml,
NULL, NULL)))
goto cleanup;
} else if (vm->newDef) {
if (!(persistDef = qemuDomainDefCopy(driver, vm->newDef,
VIR_DOMAIN_XML_SECURE |
VIR_DOMAIN_XML_MIGRATABLE)))
goto cleanup;
}
if (!persistDef)
goto cleanup;
}
mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen,