External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-05 04:41:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: switch to virXMLProp* functions for parsing video

Browse Source 
In virDomainVideoModelDefParseXML(), use the virXMLProp* functions
rather than reimplementing them with virXPath* functions.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jonathon Jongsma 2022-02-08 16:42:05 -06:00
parent c650e460bd
commit becdee88c3
1 changed files with 20 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/conf/domain_conf.c
View File

@ -12868,18 +12868,13 @@ virDomainVideoModelDefParseXML(virDomainVideoDef *def,
xmlNodePtr accel_node; xmlNodePtr accel_node;
xmlNodePtr res_node; xmlNodePtr res_node;
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *type = NULL; virDomainVideoType type;
g_autofree char *heads = NULL; virTristateBool primary;
g_autofree char *vram = NULL;
g_autofree char *vram64 = NULL;
g_autofree char *ram = NULL;
g_autofree char *vgamem = NULL;
g_autofree char *primary = NULL;
ctxt->node = node; ctxt->node = node;
if ((primary = virXPathString("string(./@primary)", ctxt)) != NULL) if (virXMLPropTristateBool(node, "primary", VIR_XML_PROP_NONE, &primary) >= 0)
ignore_value(virStringParseYesNo(primary, &def->primary)); def->primary = (primary == VIR_TRISTATE_BOOL_YES);
if ((accel_node = virXPathNode("./acceleration", ctxt)) && if ((accel_node = virXPathNode("./acceleration", ctxt)) &&
(def->accel = virDomainVideoAccelDefParseXML(accel_node)) == NULL) (def->accel = virDomainVideoAccelDefParseXML(accel_node)) == NULL)
@ -12889,55 +12884,27 @@ virDomainVideoModelDefParseXML(virDomainVideoDef *def,
(def->res = virDomainVideoResolutionDefParseXML(res_node)) == NULL) (def->res = virDomainVideoResolutionDefParseXML(res_node)) == NULL)
return -1; return -1;
if (virXMLPropEnumDefault(node, "type",
virDomainVideoTypeFromString,
VIR_XML_PROP_NONE, &type,
VIR_DOMAIN_VIDEO_TYPE_DEFAULT) < 0)
return -1;
def->type = type;
if (virXMLPropUInt(node, "ram", 10, VIR_XML_PROP_NONE, &def->ram) < 0)
return -1;
if ((type = virXPathString("string(./@type)", ctxt))) { if (virXMLPropUInt(node, "vram", 10, VIR_XML_PROP_NONE, &def->vram) < 0)
if ((def->type = virDomainVideoTypeFromString(type)) < 0) { return -1;
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown video model '%s'"), type);
return -1;
}
}
if ((ram = virXPathString("string(./@ram)", ctxt))) { if (virXMLPropUInt(node, "vram64", 10, VIR_XML_PROP_NONE, &def->vram64) < 0)
if (virStrToLong_uip(ram, NULL, 10, &def->ram) < 0) { return -1;
virReportError(VIR_ERR_XML_ERROR,
_("cannot parse video ram '%s'"), ram);
return -1;
}
}
if ((vram = virXPathString("string(./@vram)", ctxt))) { if (virXMLPropUInt(node, "vgamem", 10, VIR_XML_PROP_NONE, &def->vgamem) < 0)
if (virStrToLong_uip(vram, NULL, 10, &def->vram) < 0) { return -1;
virReportError(VIR_ERR_XML_ERROR,
_("cannot parse video vram '%s'"), vram);
return -1;
}
}
if ((vram64 = virXPathString("string(./@vram64)", ctxt))) { if (virXMLPropUIntDefault(node, "heads", 10, VIR_XML_PROP_NONE, &def->heads, 1) < 0)
if (virStrToLong_uip(vram64, NULL, 10, &def->vram64) < 0) { return -1;
virReportError(VIR_ERR_XML_ERROR,
_("cannot parse video vram64 '%s'"), vram64);
return -1;
}
}
if ((vgamem = virXPathString("string(./@vgamem)", ctxt))) {
if (virStrToLong_uip(vgamem, NULL, 10, &def->vgamem) < 0) {
virReportError(VIR_ERR_XML_ERROR,
_("cannot parse video vgamem '%s'"), vgamem);
return -1;
}
}
if ((heads = virXPathString("string(./@heads)", ctxt))) {
if (virStrToLong_uip(heads, NULL, 10, &def->heads) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse video heads '%s'"), heads);
return -1;
}
}
return 0; return 0;
} }