[libvirt] [PATCH v2 1/3] qemu: remove unneeded cleanup labels

Michal Privoznik mprivozn at redhat.com
Tue Nov 19 14:25:37 UTC 2019


On 11/12/19 9:46 PM, Daniel Henrique Barboza wrote:
> Signed-off-by: Daniel Henrique Barboza <danielhb413 at gmail.com>
> ---
>   src/qemu/qemu_cgroup.c         |  15 ++--
>   src/qemu/qemu_domain.c         |  84 +++++++------------
>   src/qemu/qemu_domain_address.c |  31 +++----
>   src/qemu/qemu_driver.c         | 145 ++++++++++++---------------------
>   src/qemu/qemu_hotplug.c        |  75 +++++++----------
>   src/qemu/qemu_interface.c      |  26 +++---
>   src/qemu/qemu_migration.c      |  38 +++------
>   src/qemu/qemu_process.c        |  69 +++++-----------
>   src/qemu/qemu_tpm.c            |  18 ++--
>   9 files changed, 176 insertions(+), 325 deletions(-)
> 

> diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
> index 0447aa73bf..487ed03d9f 100644
> --- a/src/qemu/qemu_migration.c
> +++ b/src/qemu/qemu_migration.c

> @@ -1857,21 +1853,16 @@ qemuMigrationDstRun(virQEMUDriverPtr driver,
>       rv = qemuMonitorMigrateIncoming(priv->mon, uri);
>   
>       if (qemuDomainObjExitMonitor(driver, vm) < 0 || rv < 0)
> -        goto cleanup;
> +        return -1;
>   
> -    if (asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN) {
> +    if (asyncJob == QEMU_ASYNC_JOB_MIGRATION_IN)
>           /* qemuMigrationDstWaitForCompletion is called from the Finish phase */
> -        ret = 0;
> -        goto cleanup;
> -    }
> +        return 0;

We need to keep braces in.

Michal




More information about the libvir-list mailing list