[PATCH v2 5/5] qemuPrepareNVRAM: Drop cleanup label

Michal Privoznik mprivozn at redhat.com
Fri Feb 11 12:30:29 UTC 2022


After previous commits, the cleanup label shrank to plain
'return' statement. There's no point in having such label, so
drop it.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/qemu/qemu_process.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0ba9343b2a..0b9d96b7d5 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4462,7 +4462,6 @@ qemuPrepareNVRAM(virQEMUDriver *driver,
                  bool reset_nvram)
 {
     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-    int ret = -1;
     VIR_AUTOCLOSE srcFD = -1;
     virDomainLoaderDef *loader = vm->def->os.loader;
     const char *master_nvram_path;
@@ -4487,7 +4486,7 @@ qemuPrepareNVRAM(virQEMUDriver *driver,
         virReportError(VIR_ERR_OPERATION_FAILED,
                        _("unable to find any master var store for "
                          "loader: %s"), loader->path);
-        goto cleanup;
+        return -1;
     }
 
     if ((srcFD = virFileOpenAs(master_nvram_path, O_RDONLY,
@@ -4495,7 +4494,7 @@ qemuPrepareNVRAM(virQEMUDriver *driver,
         virReportSystemError(-srcFD,
                              _("Failed to open file '%s'"),
                              master_nvram_path);
-        goto cleanup;
+        return -1;
     }
 
     data.srcFD = srcFD;
@@ -4506,12 +4505,10 @@ qemuPrepareNVRAM(virQEMUDriver *driver,
                        cfg->user, cfg->group,
                        qemuPrepareNVRAMHelper,
                        &data) < 0) {
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
- cleanup:
-    return ret;
+    return 0;
 }
 
 
-- 
2.34.1




More information about the libvir-list mailing list