mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
conf: use virXMLPropString for actual network parsing
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:
parent
0b36d6cb08
commit
d5b025bb15
@ -9656,9 +9656,12 @@ 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) {
|
||||||
|
actual->data.direct.linkdev = virXMLPropString(sourceNode, "dev");
|
||||||
|
|
||||||
|
mode = virXMLPropString(sourceNode, "mode");
|
||||||
if (mode) {
|
if (mode) {
|
||||||
int m;
|
int m;
|
||||||
if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) {
|
if ((m = virNetDevMacVLanModeTypeFromString(mode)) < 0) {
|
||||||
@ -9669,6 +9672,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
|
|||||||
}
|
}
|
||||||
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,7 +9707,9 @@ 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",
|
||||||
@ -9712,7 +9718,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
|
|||||||
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) {
|
||||||
@ -9723,6 +9729,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
|
|||||||
goto error;
|
goto error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
bandwidth_node = virXPathNode("./bandwidth", ctxt);
|
bandwidth_node = virXPathNode("./bandwidth", ctxt);
|
||||||
if (bandwidth_node &&
|
if (bandwidth_node &&
|
||||||
|
Loading…
x
Reference in New Issue
Block a user