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

cpu: allow include files for CPU definition

Browse Source 
Allow for syntax

    <include filename="subdir/fooo.xml"/>

to reference other files in the CPU database directory

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2018-07-30 16:35:57 +01:00
parent 995b50ff58
commit eda5f575f2
1 changed files with 89 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/cpu/cpu_map.c
View File

@ -1,7 +1,7 @@
/*
* cpu_map.c: internal functions for handling CPU mapping configuration
*
* Copyright (C) 2009-2010 Red Hat, Inc.
* Copyright (C) 2009-2018 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -70,6 +70,89 @@ static int load(xmlXPathContextPtr ctxt,
return ret;
}
static int
cpuMapLoadInclude(const char *filename,
cpuMapLoadCallback cb,
void *data)
{
xmlDocPtr xml = NULL;
xmlXPathContextPtr ctxt = NULL;
int ret = -1;
int element;
char *mapfile;
if (!(mapfile = virFileFindResource(filename,
abs_topsrcdir "/src/cpu",
PKGDATADIR)))
return -1;
VIR_DEBUG("Loading CPU map include from %s", mapfile);
if (!(xml = virXMLParseFileCtxt(mapfile, &ctxt)))
goto cleanup;
ctxt->node = xmlDocGetRootElement(xml);
for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) {
if (load(ctxt, element, cb, data) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse CPU map '%s'"), mapfile);
goto cleanup;
}
}
ret = 0;
cleanup:
xmlXPathFreeContext(ctxt);
xmlFreeDoc(xml);
VIR_FREE(mapfile);
return ret;
}
static int
loadIncludes(xmlXPathContextPtr ctxt,
cpuMapLoadCallback callback,
void *data)
{
int ret = -1;
xmlNodePtr ctxt_node;
xmlNodePtr *nodes = NULL;
int n;
size_t i;
ctxt_node = ctxt->node;
n = virXPathNodeSet("include", ctxt, &nodes);
if (n < 0)
goto cleanup;
for (i = 0; i < n; i++) {
char *filename = virXMLPropString(nodes[i], "filename");
if (!filename) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing 'filename' in CPU map include"));
goto cleanup;
}
VIR_DEBUG("Finding CPU map include '%s'", filename);
if (cpuMapLoadInclude(filename, callback, data) < 0) {
VIR_FREE(filename);
goto cleanup;
}
VIR_FREE(filename);
}
ret = 0;
cleanup:
ctxt->node = ctxt_node;
VIR_FREE(nodes);
return ret;
}
int cpuMapLoad(const char *arch,
cpuMapLoadCallback cb,
@ -88,7 +171,7 @@ int cpuMapLoad(const char *arch,
PKGDATADIR)))
return -1;
VIR_DEBUG("Loading CPU map from %s", mapfile);
VIR_DEBUG("Loading '%s' CPU map from %s", NULLSTR(arch), mapfile);
if (arch == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR,
@ -122,11 +205,14 @@ int cpuMapLoad(const char *arch,
for (element = 0; element < CPU_MAP_ELEMENT_LAST; element++) {
if (load(ctxt, element, cb, data) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse CPU map for %s architecture"), arch);
_("cannot parse CPU map '%s'"), mapfile);
goto cleanup;
}
}
if (loadIncludes(ctxt, cb, data) < 0)
goto cleanup;
ret = 0;
cleanup: