NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemuMigrationDstPersist: Avoid multi-line ternary operator in function call

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 14:07:47 +02:00
parent a74fceb7d5
commit b9fab14b81
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_migration.c
View File

@ -6393,6 +6393,7 @@ qemuMigrationDstPersist(virQEMUDriver *driver,
g_autoptr(virDomainDef) oldDef = NULL; g_autoptr(virDomainDef) oldDef = NULL;
unsigned int oldPersist = vm->persistent; unsigned int oldPersist = vm->persistent;
virObjectEvent *event; virObjectEvent *event;
virDomainEventDefinedDetailType eventDetail = VIR_DOMAIN_EVENT_DEFINED_UPDATED;
vm->persistent = 1; vm->persistent = 1;
oldDef = vm->newDef; oldDef = vm->newDef;
@ -6402,18 +6403,19 @@ qemuMigrationDstPersist(virQEMUDriver *driver,
priv->qemuCaps))) priv->qemuCaps)))
goto error; goto error;
if (!oldPersist && qemuDomainNamePathsCleanup(cfg, vmdef->name, false) < 0) if (!oldPersist) {
goto error; eventDetail = VIR_DOMAIN_EVENT_DEFINED_ADDED;
if (qemuDomainNamePathsCleanup(cfg, vmdef->name, false) < 0)
goto error;
}
if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0 && if (virDomainDefSave(vmdef, driver->xmlopt, cfg->configDir) < 0 &&
!ignoreSaveError) !ignoreSaveError)
goto error; goto error;
event = virDomainEventLifecycleNewFromObj(vm, event = virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_DEFINED,
VIR_DOMAIN_EVENT_DEFINED, eventDetail);
oldPersist ?
VIR_DOMAIN_EVENT_DEFINED_UPDATED :
VIR_DOMAIN_EVENT_DEFINED_ADDED);
virObjectEventStateQueue(driver->domainEventState, event); virObjectEventStateQueue(driver->domainEventState, event);
return 0; return 0;