NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virQEMUDriverConfigLoadNVRAMEntry: use VIR_AUTOFREE

Browse Source 
Switch the function to use VIR_AUTOFREE and VIR_AUTOPTR macros
to get rid of the cleanup section.

Requested-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Ján Tomko 2019-01-21 14:48:18 +01:00
parent 92e601d08c
commit 2a33dc41bb
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_conf.c
View File

@ -829,31 +829,27 @@ static int
virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg, virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg,
virConfPtr conf) virConfPtr conf)
{ {
char **nvram = NULL; VIR_AUTOPTR(virString) nvram = NULL;
int ret = -1;
size_t i; size_t i;
if (virConfGetValueStringList(conf, "nvram", false, &nvram) < 0) if (virConfGetValueStringList(conf, "nvram", false, &nvram) < 0)
goto cleanup; return -1;
if (nvram) { if (nvram) {
virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares); virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares);
cfg->nfirmwares = virStringListLength((const char *const *)nvram); cfg->nfirmwares = virStringListLength((const char *const *)nvram);
if (nvram[0] && VIR_ALLOC_N(cfg->firmwares, cfg->nfirmwares) < 0) if (nvram[0] && VIR_ALLOC_N(cfg->firmwares, cfg->nfirmwares) < 0)
goto cleanup; return -1;
for (i = 0; nvram[i] != NULL; i++) { for (i = 0; nvram[i] != NULL; i++) {
if (VIR_ALLOC(cfg->firmwares[i]) < 0) if (VIR_ALLOC(cfg->firmwares[i]) < 0)
goto cleanup; return -1;
if (virFirmwareParse(nvram[i], cfg->firmwares[i]) < 0) if (virFirmwareParse(nvram[i], cfg->firmwares[i]) < 0)
goto cleanup; return -1;
} }
} }
ret = 0; return 0;
cleanup:
virStringListFree(nvram);
return ret;
} }