External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 21:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Move nvramTemplate parsing

Browse Source 
It belongs to virDomainLoaderDefParseXMLNvram(), where the other
parts of the <nvram> element are handled.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Andrea Bolognani 2022-06-16 17:52:14 +02:00
parent cec35f4a52
commit 5943e4ade6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/conf/domain_conf.c
View File

@ -17996,11 +17996,15 @@ static int
virDomainLoaderDefParseXMLNvram(virDomainLoaderDef *loader,
xmlXPathContextPtr ctxt,
virDomainXMLOption *xmlopt,
unsigned int flags)
unsigned int flags,
bool fwAutoSelect)
{
g_autofree char *nvramType = virXPathString("string(./os/nvram/@type)", ctxt);
g_autoptr(virStorageSource) src = virStorageSourceNew();
if (!fwAutoSelect)
loader->nvramTemplate = virXPathString("string(./os/nvram[1]/@template)", ctxt);
src->format = VIR_STORAGE_FILE_RAW;
if (!nvramType) {
@ -18468,12 +18472,11 @@ virDomainDefParseBootLoaderOptions(virDomainDef *def,
fwAutoSelect) < 0)
return -1;
if (virDomainLoaderDefParseXMLNvram(def->os.loader, ctxt, xmlopt, flags) < 0)
if (virDomainLoaderDefParseXMLNvram(def->os.loader,
ctxt, xmlopt, flags,
fwAutoSelect) < 0)
return -1;
if (!fwAutoSelect)
def->os.loader->nvramTemplate = virXPathString("string(./os/nvram[1]/@template)", ctxt);
return 0;
}