External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 09:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring virDomainVideoDriverDefParseXML() 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:12 +02:00 committed by Michal Privoznik
parent bcce7f2e3a
commit fc7e1b2f03
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/conf/domain_conf.c
View File

@ -14313,34 +14313,24 @@ virDomainVideoResolutionDefParseXML(xmlNodePtr node)
static virDomainVideoDriverDef *
virDomainVideoDriverDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt G_GNUC_UNUSED)
xmlXPathContextPtr ctxt)
{
xmlNodePtr cur;
virDomainVideoDriverDef *def;
int val;
g_autofree char *vgaconf = NULL;
unsigned int val;
xmlNodePtr driver = NULL;
VIR_XPATH_NODE_AUTORESTORE(ctxt)
cur = node->children;
while (cur != NULL) {
if (cur->type == XML_ELEMENT_NODE) {
if (!vgaconf &&
virXMLNodeNameEqual(cur, "driver")) {
vgaconf = virXMLPropString(cur, "vgaconf");
}
}
cur = cur->next;
}
ctxt->node = node;
if (!vgaconf)
if (!(driver = virXPathNode("./driver", ctxt)))
return NULL;
if (virXMLPropEnum(driver, "vgaconf",
virDomainVideoVGAConfTypeFromString,
VIR_XML_PROP_NONZERO, &val) < 0)
return NULL;
def = g_new0(virDomainVideoDriverDef, 1);
if ((val = virDomainVideoVGAConfTypeFromString(vgaconf)) <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("unknown vgaconf value '%s'"), vgaconf);
return def;
}
def->vgaconf = val;
return def;

2
src/conf/domain_conf.h
View File

@ -1665,7 +1665,7 @@ struct _virDomainVideoResolutionDef {
};
struct _virDomainVideoDriverDef {
virDomainVideoVGAConf vgaconf;
virDomainVideoVGAConf vgaconf;
char *vhost_user_binary;
};