External/libvirt
1
0
Fork 0
Code

qemu: migration: Overwrite 'dname' only when NULL

Browse Source 
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-25 12:47:40 +02:00
parent b9fab14b81
commit ec272cd94e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_migration.c
View File

@ -5422,7 +5422,8 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driver,
* status code from the sender to the destination host, * status code from the sender to the destination host,
* so it can do any cleanup if the migration failed. * so it can do any cleanup if the migration failed.
*/ */
dname = dname ? dname : vm->def->name; if (!dname)
dname = vm->def->name;
VIR_DEBUG("Finish2 %p ret=%d", dconn, ret); VIR_DEBUG("Finish2 %p ret=%d", dconn, ret);
qemuDomainObjEnterRemote(vm); qemuDomainObjEnterRemote(vm);
ddomain = dconn->driver->domainMigrateFinish2 ddomain = dconn->driver->domainMigrateFinish2
@ -5707,7 +5708,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver,
goto cleanup; goto cleanup;
} }
} else { } else {
dname = dname ? dname : vm->def->name; if (!dname)
dname = vm->def->name;
qemuDomainObjEnterRemote(vm); qemuDomainObjEnterRemote(vm);
ddomain = dconn->driver->domainMigrateFinish3 ddomain = dconn->driver->domainMigrateFinish3
(dconn, dname, cookiein, cookieinlen, &cookieout, &cookieoutlen, (dconn, dname, cookiein, cookieinlen, &cookieout, &cookieoutlen,