External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-11 04:15:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: don't pass interface type into virNetDevBandwidthParse

Browse Source 
The virNetDevBandwidthParse method uses the interface type to decide
whether to allow use of the "floor" parameter. Using the interface
type is not convenient as callers may not have that available, but
still wish to allow use of "floor". Switch to an explicit boolean
to control its usage.

Reviewed-by: Laine Stump <laine@laine.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-01-29 17:26:40 +00:00
parent 9900da3c93
commit e2c5f0f6cf
5 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/domain_conf.c
View File

@ -11270,7 +11270,7 @@ virDomainActualNetDefParseXML(xmlNodePtr node,
if (bandwidth_node &&
virNetDevBandwidthParse(&actual->bandwidth,
bandwidth_node,
actual->type) < 0)
actual->type == VIR_DOMAIN_NET_TYPE_NETWORK) < 0)
goto error;
vlanNode = virXPathNode("./vlan", ctxt);
@ -11609,7 +11609,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
} else if (virXMLNodeNameEqual(cur, "bandwidth")) {
if (virNetDevBandwidthParse(&def->bandwidth,
cur,
def->type) < 0)
def->type == VIR_DOMAIN_NET_TYPE_NETWORK) < 0)
goto error;
} else if (virXMLNodeNameEqual(cur, "vlan")) {
if (virNetDevVlanParse(cur, ctxt, &def->vlan) < 0)

22
src/conf/netdev_bandwidth_conf.c
View File

@ -100,18 +100,18 @@ virNetDevBandwidthParseRate(xmlNodePtr node, virNetDevBandwidthRatePtr rate)
* virNetDevBandwidthParse:
* @bandwidth: parsed bandwidth
* @node: XML node
* @net_type: one of virDomainNetType
* @allowFloor: whether "floor" setting is supported
*
* Parse bandwidth XML and return pointer to structure.
* @net_type tell to which type will/is interface connected to.
* Pass -1 if this is not called on interface.
* The @allowFloor attribute indicates whether the caller
* is able to support use of the "floor" setting.
*
* Returns !NULL on success, NULL on error.
*/
int
virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
xmlNodePtr node,
int net_type)
bool allowFloor)
{
int ret = -1;
virNetDevBandwidthPtr def = NULL;
@ -162,17 +162,9 @@ virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
goto cleanup;
}
if (def->in->floor && net_type != VIR_DOMAIN_NET_TYPE_NETWORK) {
if (net_type == -1) {
/* 'floor' on network isn't supported */
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("floor attribute isn't supported for "
"network's bandwidth yet"));
} else {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("floor attribute is supported only for "
"interfaces of type network"));
}
if (def->in->floor && !allowFloor) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("floor attribute is not supported for this config"));
goto cleanup;
}
}

2
src/conf/netdev_bandwidth_conf.h
View File

@ -27,7 +27,7 @@
int virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwidth,
xmlNodePtr node,
int net_type)
bool allowFloor)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK;
int virNetDevBandwidthFormat(virNetDevBandwidthPtr def,
virBufferPtr buf);

4
src/conf/network_conf.c
View File

@ -1188,7 +1188,7 @@ virNetworkPortGroupParseXML(virPortGroupDefPtr def,
bandwidth_node = virXPathNode("./bandwidth", ctxt);
if (bandwidth_node &&
virNetDevBandwidthParse(&def->bandwidth, bandwidth_node, -1) < 0)
virNetDevBandwidthParse(&def->bandwidth, bandwidth_node, false) < 0)
goto cleanup;
vlanNode = virXPathNode("./vlan", ctxt);
@ -1682,7 +1682,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt)
}
if ((bandwidthNode = virXPathNode("./bandwidth", ctxt)) &&
virNetDevBandwidthParse(&def->bandwidth, bandwidthNode, -1) < 0)
virNetDevBandwidthParse(&def->bandwidth, bandwidthNode, false) < 0)
goto error;
vlanNode = virXPathNode("./vlan", ctxt);

2
tests/virnetdevbandwidthtest.c
View File

@ -55,7 +55,7 @@ struct testSetStruct {
\
rc = virNetDevBandwidthParse(&(var), \
ctxt->node, \
VIR_DOMAIN_NET_TYPE_NETWORK); \
true); \
xmlFreeDoc(doc); \
xmlXPathFreeContext(ctxt); \
if (rc < 0) \