NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: clean up after adding calls to virNetDevIPInfo helpers

Browse Source 
virDomainNetIPInfoParseXML() and virDomainNetIPInfoFormat() are no
longer "unused", so we can now remove the "ATTRIBUTE_UNUSED" from
their definitions, since virDomainNetIPInfoFormat() is now the only
caller of virDomainNetIPsFormat() and virDomainNetRoutesFormat(),
those two functions can simply be subsumed into
virDomainNetIPInfoFormat().
This commit is contained in:
Laine Stump 2016-06-08 21:08:31 -04:00
parent d987f63a45
commit 255995827b
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/conf/domain_conf.c
View File

@ -6176,7 +6176,7 @@ virDomainNetIPParseXML(xmlNodePtr node)
* *
* return 0 on success (including none found) and -1 on failure. * return 0 on success (including none found) and -1 on failure.
*/ */
static int ATTRIBUTE_UNUSED static int
virDomainNetIPInfoParseXML(const char *source, virDomainNetIPInfoParseXML(const char *source,
xmlXPathContextPtr ctxt, xmlXPathContextPtr ctxt,
virNetDevIPInfoPtr def) virNetDevIPInfoPtr def)
@ -20238,14 +20238,16 @@ virDomainFSDefFormat(virBufferPtr buf,
return 0; return 0;
} }
static int static int
virDomainNetIPsFormat(virBufferPtr buf, virNetDevIPAddrPtr *ips, size_t nips) virDomainNetIPInfoFormat(virBufferPtr buf,
virNetDevIPInfoPtr def)
{ {
size_t i; size_t i;
/* Output IP addresses */ /* Output IP addresses */
for (i = 0; i < nips; i++) { for (i = 0; i < def->nips; i++) {
virSocketAddrPtr address = &ips[i]->address; virSocketAddrPtr address = &def->ips[i]->address;
char *ipStr = virSocketAddrFormat(address); char *ipStr = virSocketAddrFormat(address);
const char *familyStr = NULL; const char *familyStr = NULL;
@ -20260,34 +20262,13 @@ virDomainNetIPsFormat(virBufferPtr buf, virNetDevIPAddrPtr *ips, size_t nips)
VIR_FREE(ipStr); VIR_FREE(ipStr);
if (familyStr) if (familyStr)
virBufferAsprintf(buf, " family='%s'", familyStr); virBufferAsprintf(buf, " family='%s'", familyStr);
if (ips[i]->prefix != 0) if (def->ips[i]->prefix)
virBufferAsprintf(buf, " prefix='%u'", ips[i]->prefix); virBufferAsprintf(buf, " prefix='%u'", def->ips[i]->prefix);
virBufferAddLit(buf, "/>\n"); virBufferAddLit(buf, "/>\n");
} }
return 0;
}
static int for (i = 0; i < def->nroutes; i++)
virDomainNetRoutesFormat(virBufferPtr buf, if (virNetDevIPRouteFormat(buf, def->routes[i]) < 0)
virNetDevIPRoutePtr *routes,
size_t nroutes)
{
size_t i;
for (i = 0; i < nroutes; i++)
if (virNetDevIPRouteFormat(buf, routes[i]) < 0)
return -1;
return 0;
}
static int ATTRIBUTE_UNUSED
virDomainNetIPInfoFormat(virBufferPtr buf,
virNetDevIPInfoPtr def)
{
if (virDomainNetIPsFormat(buf, def->ips, def->nips) < 0)
return -1;
if (virDomainNetRoutesFormat(buf, def->routes, def->nroutes) < 0)
return -1; return -1;
return 0; return 0;
} }