External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 07:17:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: Convert virCPUDefParseXML() to virXMLProp*()

Browse Source 
After previous cleanups, the virCPUDefParseXML() function uses a
mixture of virXMLProp*() and the old virXMLPropString() +
virXXXTypeFromString() patterns. Rework it so that virXMLProp*()
is used.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Michal Privoznik 2022-01-20 21:57:35 +01:00
parent 0fe2d8dd33
commit 0aaf410262
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/cpu_conf.c
View File

@ -407,17 +407,11 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
}
if (def->type == VIR_CPU_TYPE_GUEST) {
g_autofree char *match = virXMLPropString(ctxt->node, "match");
if (match) {
def->match = virCPUMatchTypeFromString(match);
if (def->match < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Invalid match attribute for CPU "
"specification"));
return -1;
}
}
if (virXMLPropEnum(ctxt->node, "match",
virCPUMatchTypeFromString,
VIR_XML_PROP_NONE,
&def->match) < 0)
return -1;
if (virXMLPropEnum(ctxt->node, "check", virCPUCheckTypeFromString,
VIR_XML_PROP_NONE, &def->check) < 0)
@ -450,12 +444,10 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
if ((counter_node = virXPathNode("./counter[@name='tsc'])", ctxt))) {
tsc = g_new0(virHostCPUTscInfo, 1);
if (virXPathULongLong("string(./counter[@name='tsc']/@frequency)",
ctxt, &tsc->frequency) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("Invalid TSC frequency"));
if (virXMLPropULongLong(counter_node, "frequency", 10,
VIR_XML_PROP_REQUIRED,
&tsc->frequency) < 0)
return -1;
}
if (virXMLPropTristateBool(counter_node, "scaling",
VIR_XML_PROP_NONE,

2
src/conf/cpu_conf.h
View File

@ -122,7 +122,7 @@ struct _virCPUDef {
int refs;
int type; /* enum virCPUType */
int mode; /* enum virCPUMode */
int match; /* enum virCPUMatch */
virCPUMatch match;
virCPUCheck check;
virArch arch;
char *model;