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

Allow controller XML parsing to use XPath context

Browse Source 
virDomainParseScaledValue requires it.
This commit is contained in:
Ján Tomko 2013-08-13 15:10:17 +02:00
parent 87e3a05cba
commit 4582bc2e78
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/conf/domain_conf.c
View File

@ -5670,6 +5670,7 @@ virDomainControllerModelTypeFromString(const virDomainControllerDefPtr def,
*/ */
static virDomainControllerDefPtr static virDomainControllerDefPtr
virDomainControllerDefParseXML(xmlNodePtr node, virDomainControllerDefParseXML(xmlNodePtr node,
xmlXPathContextPtr ctxt,
unsigned int flags) unsigned int flags)
{ {
virDomainControllerDefPtr def; virDomainControllerDefPtr def;
@ -5678,6 +5679,9 @@ virDomainControllerDefParseXML(xmlNodePtr node,
char *idx = NULL; char *idx = NULL;
char *model = NULL; char *model = NULL;
char *queues = NULL; char *queues = NULL;
xmlNodePtr saved = ctxt->node;
ctxt->node = node;
if (VIR_ALLOC(def) < 0) if (VIR_ALLOC(def) < 0)
return NULL; return NULL;
@ -5819,6 +5823,7 @@ virDomainControllerDefParseXML(xmlNodePtr node,
} }
cleanup: cleanup:
ctxt->node = saved;
VIR_FREE(type); VIR_FREE(type);
VIR_FREE(idx); VIR_FREE(idx);
VIR_FREE(model); VIR_FREE(model);
@ -9491,7 +9496,8 @@ virDomainDeviceDefParse(const char *xmlStr,
goto error; goto error;
break; break;
case VIR_DOMAIN_DEVICE_CONTROLLER: case VIR_DOMAIN_DEVICE_CONTROLLER:
if (!(dev->data.controller = virDomainControllerDefParseXML(node, flags))) if (!(dev->data.controller = virDomainControllerDefParseXML(node, ctxt,
flags)))
goto error; goto error;
break; break;
case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_GRAPHICS:
@ -11699,6 +11705,7 @@ virDomainDefParseXML(xmlDocPtr xml,
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
virDomainControllerDefPtr controller = virDomainControllerDefParseXML(nodes[i], virDomainControllerDefPtr controller = virDomainControllerDefParseXML(nodes[i],
ctxt,
flags); flags);
if (!controller) if (!controller)
goto error; goto error;