From ec272cd94e249abf627f5bb97117bf9f4239b2f3 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 25 Jul 2022 12:47:40 +0200 Subject: [PATCH] qemu: migration: Overwrite 'dname' only when NULL Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_migration.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 083cbc5993..01cc9da8b3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -5422,7 +5422,8 @@ qemuMigrationSrcPerformPeer2Peer2(virQEMUDriver *driver, * status code from the sender to the destination host, * 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); qemuDomainObjEnterRemote(vm); ddomain = dconn->driver->domainMigrateFinish2 @@ -5707,7 +5708,8 @@ qemuMigrationSrcPerformPeer2Peer3(virQEMUDriver *driver, goto cleanup; } } else { - dname = dname ? dname : vm->def->name; + if (!dname) + dname = vm->def->name; qemuDomainObjEnterRemote(vm); ddomain = dconn->driver->domainMigrateFinish3 (dconn, dname, cookiein, cookieinlen, &cookieout, &cookieoutlen,