External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Rewrite qemuFirmwareFetchParsedConfigs()

Browse Source 
Instead of returning the list of paths exactly as obtained
from qemuFirmwareFetchConfigs(), and allocating the list of
firmwares to be exactly that size right away, start with two
empty lists and add elements to them one by one.

At the moment this only makes things more verbose, but later
we're going to change things so that it's possible that some
of the paths/firmwares are not included in the lists returned
to the caller, and at that point the changes will pay off.

Note that we can't use g_auto() for the new list of paths,
because until the very last moment it's not null-terminated,
so g_strfreev() wouldn't be able to handle it correctly.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2024-02-29 16:16:53 +01:00
parent dcad670212
commit e0438b2e80
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/qemu/qemu_firmware.c
View File

@ -1562,35 +1562,49 @@ qemuFirmwareFetchParsedConfigs(bool privileged,
qemuFirmware ***firmwaresRet, qemuFirmware ***firmwaresRet,
char ***pathsRet) char ***pathsRet)
{ {
g_auto(GStrv) paths = NULL; g_auto(GStrv) possiblePaths = NULL;
size_t npaths; char **currentPath = NULL;
qemuFirmware **firmwares = NULL; qemuFirmware **firmwares = NULL;
size_t i; char **paths = NULL;
size_t nfirmwares = 0;
size_t npaths = 0;
if (qemuFirmwareFetchConfigs(&paths, privileged) < 0) if (qemuFirmwareFetchConfigs(&possiblePaths, privileged) < 0)
return -1; return -1;
if (!paths) if (!possiblePaths)
return 0; return 0;
npaths = g_strv_length(paths); for (currentPath = possiblePaths; *currentPath; currentPath++) {
qemuFirmware *firmware = qemuFirmwareParse(*currentPath);
firmwares = g_new0(qemuFirmware *, npaths); if (!firmware)
for (i = 0; i < npaths; i++) {
if (!(firmwares[i] = qemuFirmwareParse(paths[i])))
goto error; goto error;
VIR_APPEND_ELEMENT(firmwares, nfirmwares, firmware);
if (pathsRet) {
char *path = g_strdup(*currentPath);
VIR_APPEND_ELEMENT(paths, npaths, path);
}
} }
*firmwaresRet = g_steal_pointer(&firmwares); *firmwaresRet = firmwares;
if (pathsRet) if (pathsRet) {
*pathsRet = g_steal_pointer(&paths); char *terminator = NULL;
return npaths; VIR_APPEND_ELEMENT(paths, npaths, terminator);
*pathsRet = paths;
}
return nfirmwares;
error: error:
while (i > 0) while (nfirmwares > 0)
qemuFirmwareFree(firmwares[--i]); qemuFirmwareFree(firmwares[--nfirmwares]);
VIR_FREE(firmwares); VIR_FREE(firmwares);
while (npaths > 0)
VIR_FREE(paths[--npaths]);
VIR_FREE(paths);
return -1; return -1;
} }