From: Peter Krempa Date: Mon, 25 Jul 2022 12:03:18 +0000 (+0200) Subject: qemuMigrationDstFinishFresh: Avoid multi-line ternary operator in function call X-Git-Tag: v8.6.0-rc1~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a74fceb7d588b40054444ee98c40985409d41273;p=thirdparty%2Flibvirt.git qemuMigrationDstFinishFresh: Avoid multi-line ternary operator in function call Rewrite the code using a temporary variable. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 20dc91f1ce..b28c479345 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6601,9 +6601,12 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, *inPostCopy = true; if (!(flags & VIR_MIGRATE_PAUSED)) { - if (qemuProcessStartCPUs(driver, vm, - *inPostCopy ? VIR_DOMAIN_RUNNING_POSTCOPY - : VIR_DOMAIN_RUNNING_MIGRATED, + virDomainRunningReason runningReason = VIR_DOMAIN_RUNNING_MIGRATED; + + if (*inPostCopy) + runningReason = VIR_DOMAIN_RUNNING_POSTCOPY; + + if (qemuProcessStartCPUs(driver, vm, runningReason, VIR_ASYNC_JOB_MIGRATION_IN) < 0) { if (virGetLastErrorCode() == VIR_ERR_OK) virReportError(VIR_ERR_INTERNAL_ERROR,