External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-02 04:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fillXenCaps: Cleanup

Browse Source 
Rework to remove unnecessary label and goto.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-11-08 12:25:45 +01:00
parent 9dcfd7030a
commit 086f44a0fe
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/domaincapstest.c
View File

@ -135,25 +135,17 @@ fillQemuCaps(virDomainCaps *domCaps,
static int static int
fillXenCaps(virDomainCaps *domCaps) fillXenCaps(virDomainCaps *domCaps)
{ {
virFirmware **firmwares; g_autoptr(virFirmware) fw_hvmloader = g_new0(virFirmware, 1);
int ret = -1; g_autoptr(virFirmware) fw_ovmf = g_new0(virFirmware, 1);
virFirmware *firmwares[] = { fw_hvmloader, fw_ovmf };
firmwares = g_new0(virFirmware *, 2);
firmwares[0] = g_new0(virFirmware, 1);
firmwares[1] = g_new0(virFirmware, 1);
firmwares[0]->name = g_strdup("/usr/lib/xen/boot/hvmloader"); firmwares[0]->name = g_strdup("/usr/lib/xen/boot/hvmloader");
firmwares[1]->name = g_strdup("/usr/lib/xen/boot/ovmf.bin"); firmwares[1]->name = g_strdup("/usr/lib/xen/boot/ovmf.bin");
if (libxlMakeDomainCapabilities(domCaps, firmwares, 2) < 0) if (libxlMakeDomainCapabilities(domCaps, firmwares, 2) < 0)
goto cleanup; return -1;
ret = 0; return 0;
cleanup:
virFirmwareFreeList(firmwares, 2);
return ret;
} }
#endif /* WITH_LIBXL */ #endif /* WITH_LIBXL */