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

qemu_capabilities: Put only unique FW images into domcaps

Browse Source 
In the domain capabilities XML there are FW image paths printed.
There are two sources for the image paths (in order of
preference):

  1) firmware descriptor files - as returned by
  qemuFirmwareGetSupported()

  2) a compile time list of FW:NRAM pairs which can be overridden
  in qemu.conf

If either of those contains a duplicate FW image path (which is
a valid use case) it is printed twice in the capabilities XML.
While it's technically not a bug, it doesn't look good.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Tested-by: Kashyap Chamarthy <kchamart@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Michal Privoznik 2019-09-12 13:07:31 +02:00
parent 808fa349f3
commit 2f163204ff
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/qemu/qemu_capabilities.c
View File

@ -5136,12 +5136,22 @@ virQEMUCapsFillDomainLoaderCaps(virDomainCapsLoaderPtr capsLoader,
for (i = 0; i < nfirmwares; i++) { for (i = 0; i < nfirmwares; i++) {
const char *filename = firmwares[i]->name; const char *filename = firmwares[i]->name;
size_t j;
if (!virFileExists(filename)) { if (!virFileExists(filename)) {
VIR_DEBUG("loader filename=%s does not exist", filename); VIR_DEBUG("loader filename=%s does not exist", filename);
continue; continue;
} }
/* Put only unique FW images onto the list */
for (j = 0; j < capsLoader->values.nvalues; j++) {
if (STREQ(filename, capsLoader->values.values[j]))
break;
}
if (j != capsLoader->values.nvalues)
continue;
if (VIR_STRDUP(capsLoader->values.values[capsLoader->values.nvalues], if (VIR_STRDUP(capsLoader->values.values[capsLoader->values.nvalues],
filename) < 0) filename) < 0)
return -1; return -1;