]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuPrepareNVRAM: Drop cleanup label
authorMichal Privoznik <mprivozn@redhat.com>
Fri, 11 Feb 2022 08:31:48 +0000 (09:31 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 11 Feb 2022 13:00:07 +0000 (14:00 +0100)
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@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
src/qemu/qemu_process.c

index 0ba9343b2a033f289081391668a74525682e8bdd..0b9d96b7d505cd4735b94eb40ce6ad0798c8ab0e 100644 (file)
@@ -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;
 }