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

conf: use virXMLPropString for actual network parsing

Browse Source 
XPath is good for random search of elements, not for accessing
attributes of one node.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2017-08-16 14:01:54 +02:00
parent 0b36d6cb08
commit d5b025bb15
1 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/conf/domain_conf.c
View File

@ -9656,18 +9656,22 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
} }
if (actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) { if (actual->type == VIR_DOMAIN_NET_TYPE_DIRECT) {
actual->data.direct.linkdev = virXPathString("string(./source[1]/@dev)", ctxt); xmlNodePtr sourceNode = virXPathNode("./source[1]", ctxt);
mode = virXPathString("string(./source[1]/@mode)", ctxt); if (sourceNode) {
if (mode) { actual->data.direct.linkdev = virXMLPropString(sourceNode, "dev");
int m;
if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) { mode = virXMLPropString(sourceNode, "mode");
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, if (mode) {
_("Unknown mode '%s' in interface <actual> element"), int m;
mode); if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) {
goto error; virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Unknown mode '%s' in interface <actual> element"),
mode);
goto error;
}
actual->data.direct.mode = m;
} }
actual->data.direct.mode = m;
} }
} else if (actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) { } else if (actual->type == VIR_DOMAIN_NET_TYPE_HOSTDEV) {
virDomainHostdevDefPtr hostdev = &actual->data.hostdev.def; virDomainHostdevDefPtr hostdev = &actual->data.hostdev.def;
@ -9703,24 +9707,27 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
} }
if (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE || if (actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE ||
actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) { actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) {
char *brname = virXPathString("string(./source/@bridge)", ctxt); xmlNodePtr sourceNode = virXPathNode("./source", ctxt);
if (sourceNode) {
char *brname = virXMLPropString(sourceNode, "bridge");
if (!brname && actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE) { if (!brname && actual->type == VIR_DOMAIN_NET_TYPE_BRIDGE) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing <source> element with bridge name in " _("Missing <source> element with bridge name in "
"interface's <actual> element")); "interface's <actual> element"));
goto error; goto error;
} }
actual->data.bridge.brname = brname; actual->data.bridge.brname = brname;
macTableManager = virXPathString("string(./source/@macTableManager)", ctxt); macTableManager = virXMLPropString(sourceNode, "macTableManager");
if (macTableManager && if (macTableManager &&
(actual->data.bridge.macTableManager (actual->data.bridge.macTableManager
= virNetworkBridgeMACTableManagerTypeFromString(macTableManager)) <= 0) { = virNetworkBridgeMACTableManagerTypeFromString(macTableManager)) <= 0) {
virReportError(VIR_ERR_XML_ERROR, virReportError(VIR_ERR_XML_ERROR,
_("Invalid macTableManager setting '%s' " _("Invalid macTableManager setting '%s' "
"in domain interface's <actual> element"), "in domain interface's <actual> element"),
macTableManager); macTableManager);
goto error; goto error;
}
} }
} }