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

Refactoring virDomainVideoDefParseXML() to use XPath

Browse Source 
Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Kristina Hanicova 2021-05-04 13:40:13 +02:00 committed by Michal Privoznik
parent fc7e1b2f03
commit 8391cfbc2d
1 changed files with 25 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
src/conf/domain_conf.c
View File

@ -14343,10 +14343,11 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
unsigned int flags) unsigned int flags)
{ {
g_autoptr(virDomainVideoDef) def = NULL; g_autoptr(virDomainVideoDef) def = NULL;
xmlNodePtr cur; xmlNodePtr driver;
xmlNodePtr accel_node;
xmlNodePtr res_node;
VIR_XPATH_NODE_AUTORESTORE(ctxt) VIR_XPATH_NODE_AUTORESTORE(ctxt)
g_autofree char *type = NULL; g_autofree char *type = NULL;
g_autofree char *driver_name = NULL;
g_autofree char *heads = NULL; g_autofree char *heads = NULL;
g_autofree char *vram = NULL; g_autofree char *vram = NULL;
g_autofree char *vram64 = NULL; g_autofree char *vram64 = NULL;
@ -14359,51 +14360,27 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
ctxt->node = node; ctxt->node = node;
cur = node->children; if ((primary = virXPathString("string(./model/@primary)", ctxt)) != NULL)
while (cur != NULL) { ignore_value(virStringParseYesNo(primary, &def->primary));
if (cur->type == XML_ELEMENT_NODE) {
if (!type && !vram && !ram && !heads &&
virXMLNodeNameEqual(cur, "model")) {
xmlNodePtr child;
type = virXMLPropString(cur, "type");
ram = virXMLPropString(cur, "ram");
vram = virXMLPropString(cur, "vram");
vram64 = virXMLPropString(cur, "vram64");
vgamem = virXMLPropString(cur, "vgamem");
heads = virXMLPropString(cur, "heads");
if ((primary = virXMLPropString(cur, "primary")) != NULL) { if ((accel_node = virXPathNode("./model/acceleration", ctxt)) &&
ignore_value(virStringParseYesNo(primary, &def->primary)); (def->accel = virDomainVideoAccelDefParseXML(accel_node)) == NULL)
VIR_FREE(primary); return NULL;
}
child = cur->children; if ((res_node = virXPathNode("./model/resolution", ctxt)) &&
while (child != NULL) { (def->res = virDomainVideoResolutionDefParseXML(res_node)) == NULL)
if (child->type == XML_ELEMENT_NODE) { return NULL;
if (def->accel == NULL &&
virXMLNodeNameEqual(child, "acceleration")) { if ((driver = virXPathNode("./driver", ctxt))) {
if ((def->accel = virDomainVideoAccelDefParseXML(child)) == NULL) if (virXMLPropEnum(driver, "name",
return NULL; virDomainVideoBackendTypeFromString,
} VIR_XML_PROP_NONE, &def->backend) < 0)
if (def->res == NULL && return NULL;
virXMLNodeNameEqual(child, "resolution")) { if (virDomainVirtioOptionsParseXML(driver, &def->virtio) < 0)
if ((def->res = virDomainVideoResolutionDefParseXML(child)) == NULL) return NULL;
return NULL;
}
}
child = child->next;
}
}
if (virXMLNodeNameEqual(cur, "driver")) {
if (virDomainVirtioOptionsParseXML(cur, &def->virtio) < 0)
return NULL;
driver_name = virXMLPropString(cur, "name");
}
}
cur = cur->next;
} }
if (type) { if ((type = virXPathString("string(./model/@type)", ctxt))) {
if ((def->type = virDomainVideoTypeFromString(type)) < 0) { if ((def->type = virDomainVideoTypeFromString(type)) < 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown video model '%s'"), type); _("unknown video model '%s'"), type);
@ -14413,19 +14390,7 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
def->type = VIR_DOMAIN_VIDEO_TYPE_DEFAULT; def->type = VIR_DOMAIN_VIDEO_TYPE_DEFAULT;
} }
if (driver_name) { if ((ram = virXPathString("string(./model/@ram)", ctxt))) {
int backend;
if ((backend = virDomainVideoBackendTypeFromString(driver_name)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown video driver '%s'"), driver_name);
return NULL;
}
def->backend = backend;
} else {
def->backend = VIR_DOMAIN_VIDEO_BACKEND_TYPE_DEFAULT;
}
if (ram) {
if (virStrToLong_uip(ram, NULL, 10, &def->ram) < 0) { if (virStrToLong_uip(ram, NULL, 10, &def->ram) < 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("cannot parse video ram '%s'"), ram); _("cannot parse video ram '%s'"), ram);
@ -14433,7 +14398,7 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
} }
} }
if (vram) { if ((vram = virXPathString("string(./model/@vram)", ctxt))) {
if (virStrToLong_uip(vram, NULL, 10, &def->vram) < 0) { if (virStrToLong_uip(vram, NULL, 10, &def->vram) < 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("cannot parse video vram '%s'"), vram); _("cannot parse video vram '%s'"), vram);
@ -14441,7 +14406,7 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
} }
} }
if (vram64) { if ((vram64 = virXPathString("string(./model/@vram64)", ctxt))) {
if (virStrToLong_uip(vram64, NULL, 10, &def->vram64) < 0) { if (virStrToLong_uip(vram64, NULL, 10, &def->vram64) < 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("cannot parse video vram64 '%s'"), vram64); _("cannot parse video vram64 '%s'"), vram64);
@ -14449,7 +14414,7 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
} }
} }
if (vgamem) { if ((vgamem = virXPathString("string(./model/@vgamem)", ctxt))) {
if (virStrToLong_uip(vgamem, NULL, 10, &def->vgamem) < 0) { if (virStrToLong_uip(vgamem, NULL, 10, &def->vgamem) < 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("cannot parse video vgamem '%s'"), vgamem); _("cannot parse video vgamem '%s'"), vgamem);
@ -14457,7 +14422,7 @@ virDomainVideoDefParseXML(virDomainXMLOption *xmlopt,
} }
} }
if (heads) { if ((heads = virXPathString("string(./model/@heads)", ctxt))) {
if (virStrToLong_uip(heads, NULL, 10, &def->heads) < 0) { if (virStrToLong_uip(heads, NULL, 10, &def->heads) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("cannot parse video heads '%s'"), heads); _("cannot parse video heads '%s'"), heads);