From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Date: Tue, 3 Nov 2020 07:55:19 +0000 (+0300)
Subject: qemu: rename: return instead of goto if no cleanup required
X-Git-Tag: v6.10.0-rc1~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6c3b5e6a1193622b381eb4fb8e151b802968beb;p=thirdparty%2Flibvirt.git

qemu: rename: return instead of goto if no cleanup required

Going to cleanup label is mere return -1 thus let's just return
instead of goto to this label.

Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7817564c1c..9d169a8d4b 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -19130,20 +19130,20 @@ qemuDomainRenameCallback(virDomainObjPtr vm,
                                                  new_dom_name)) ||
         !(old_dom_cfg_file = virDomainConfigFile(cfg->configDir,
                                                  vm->def->name)))
-        goto cleanup;
+        return -1;
 
     if (vm->autostart) {
         if (!(new_dom_autostart_link = virDomainConfigFile(cfg->autostartDir,
                                                           new_dom_name)) ||
             !(old_dom_autostart_link = virDomainConfigFile(cfg->autostartDir,
                                                           vm->def->name)))
-            goto cleanup;
+            return -1;
 
         if (symlink(new_dom_cfg_file, new_dom_autostart_link) < 0) {
             virReportSystemError(errno,
                                  _("Failed to create symlink '%s to '%s'"),
                                  new_dom_autostart_link, new_dom_cfg_file);
-            goto cleanup;
+            return -1;
         }
     }