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

domain_conf: use early return in virDomainObjAssignDef()

Browse Source 
Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Kristina Hanicova 2022-07-21 12:45:51 +02:00 committed by Martin Kletzander
parent af8a241816
commit 0f729b6ce0
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/domain_conf.c
View File

@ -3928,22 +3928,24 @@ void virDomainObjAssignDef(virDomainObj *domain,
else else
virDomainDefFree(domain->newDef); virDomainDefFree(domain->newDef);
domain->newDef = g_steal_pointer(def); domain->newDef = g_steal_pointer(def);
} else { return;
if (live) {
/* save current configuration to be restored on domain shutdown */
if (!domain->newDef)
domain->newDef = domain->def;
else
virDomainDefFree(domain->def);
domain->def = g_steal_pointer(def);
} else {
if (oldDef)
*oldDef = domain->def;
else
virDomainDefFree(domain->def);
domain->def = g_steal_pointer(def);
}
} }
if (live) {
/* save current configuration to be restored on domain shutdown */
if (!domain->newDef)
domain->newDef = domain->def;
else
virDomainDefFree(domain->def);
domain->def = g_steal_pointer(def);
return;
}
if (oldDef)
*oldDef = domain->def;
else
virDomainDefFree(domain->def);
domain->def = g_steal_pointer(def);
} }