External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemuPrepareNVRAM: Drop cleanup label

Browse Source 
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>
This commit is contained in:
Michal Privoznik 2022-02-11 09:31:48 +01:00
parent 2ddb3bf0e1
commit 9a98ad6ddb
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_process.c
View File

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