External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-25 22:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_firmware: Separate firmware loading into a function

Browse Source 
This piece of code will be reused later.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Michal Privoznik 2019-04-04 15:20:37 +02:00
parent f785318187
commit 15e0b76480
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/qemu/qemu_firmware.c
View File

@ -1316,15 +1316,49 @@ qemuFirmwareSanityCheck(const qemuFirmware *fw,
} }
static ssize_t
qemuFirmwareFetchParsedConfigs(bool privileged,
qemuFirmwarePtr **firmwaresRet,
char ***pathsRet)
{
VIR_AUTOSTRINGLIST paths = NULL;
size_t npaths;
qemuFirmwarePtr *firmwares = NULL;
size_t i;
if (qemuFirmwareFetchConfigs(&paths, privileged) < 0)
return -1;
npaths = virStringListLength((const char **)paths);
if (VIR_ALLOC_N(firmwares, npaths) < 0)
return -1;
for (i = 0; i < npaths; i++) {
if (!(firmwares[i] = qemuFirmwareParse(paths[i])))
goto error;
}
VIR_STEAL_PTR(*firmwaresRet, firmwares);
VIR_STEAL_PTR(*pathsRet, paths);
return npaths;
error:
while (i > 0)
qemuFirmwareFree(firmwares[--i]);
VIR_FREE(firmwares);
return -1;
}
int int
qemuFirmwareFillDomain(virQEMUDriverPtr driver, qemuFirmwareFillDomain(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
unsigned int flags) unsigned int flags)
{ {
VIR_AUTOSTRINGLIST paths = NULL; VIR_AUTOSTRINGLIST paths = NULL;
size_t npaths = 0;
qemuFirmwarePtr *firmwares = NULL; qemuFirmwarePtr *firmwares = NULL;
size_t nfirmwares = 0; ssize_t nfirmwares = 0;
const qemuFirmware *theone = NULL; const qemuFirmware *theone = NULL;
size_t i; size_t i;
int ret = -1; int ret = -1;
@ -1335,21 +1369,10 @@ qemuFirmwareFillDomain(virQEMUDriverPtr driver,
if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE)
return 0; return 0;
if (qemuFirmwareFetchConfigs(&paths, driver->privileged) < 0) if ((nfirmwares = qemuFirmwareFetchParsedConfigs(driver->privileged,
&firmwares, &paths)) < 0)
return -1; return -1;
npaths = virStringListLength((const char **)paths);
if (VIR_ALLOC_N(firmwares, npaths) < 0)
return -1;
nfirmwares = npaths;
for (i = 0; i < nfirmwares; i++) {
if (!(firmwares[i] = qemuFirmwareParse(paths[i])))
goto cleanup;
}
for (i = 0; i < nfirmwares; i++) { for (i = 0; i < nfirmwares; i++) {
if (qemuFirmwareMatchDomain(vm->def, firmwares[i], paths[i])) { if (qemuFirmwareMatchDomain(vm->def, firmwares[i], paths[i])) {
theone = firmwares[i]; theone = firmwares[i];