External/libvirt
1
0
Fork 0
Code

Renamed virNetDevClearIPv4Address to virNetDevClearIPAddress

Browse Source 
Make clear that virNetDevClearIPv4Address can also handle IPv6
addresses by changing the name
This commit is contained in:
Cédric Bosdonnat 2014-08-06 14:18:31 +02:00
parent 3c318dc910
commit c9ebdf9b7f
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_private.syms
View File

@ -1618,7 +1618,7 @@ virMacAddrSetRaw;
# util/virnetdev.h # util/virnetdev.h
virNetDevAddMulti; virNetDevAddMulti;
virNetDevAddRoute; virNetDevAddRoute;
virNetDevClearIPv4Address; virNetDevClearIPAddress;
virNetDevDelMulti; virNetDevDelMulti;
virNetDevExists; virNetDevExists;
virNetDevGetIndex; virNetDevGetIndex;

14
src/util/virnetdev.c
View File

@ -1053,7 +1053,7 @@ virNetDevAddRoute(const char *ifname,
} }
/** /**
* virNetDevClearIPv4Address: * virNetDevClearIPAddress:
* @ifname: the interface name * @ifname: the interface name
* @addr: the IP address (IPv4 or IPv6) * @addr: the IP address (IPv4 or IPv6)
* @prefix: number of 1 bits in the netmask * @prefix: number of 1 bits in the netmask
@ -1062,9 +1062,9 @@ virNetDevAddRoute(const char *ifname,
* *
* Returns 0 in case of success or -1 in case of error. * Returns 0 in case of success or -1 in case of error.
*/ */
int virNetDevClearIPv4Address(const char *ifname, int virNetDevClearIPAddress(const char *ifname,
virSocketAddr *addr, virSocketAddr *addr,
unsigned int prefix) unsigned int prefix)
{ {
int ret = -1; int ret = -1;
struct nl_msg *nlmsg = NULL; struct nl_msg *nlmsg = NULL;
@ -1176,9 +1176,9 @@ virNetDevAddRoute(const char *ifname,
return ret; return ret;
} }
int virNetDevClearIPv4Address(const char *ifname, int virNetDevClearIPAddress(const char *ifname,
virSocketAddr *addr, virSocketAddr *addr,
unsigned int prefix) unsigned int prefix)
{ {
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
char *addrstr; char *addrstr;

6
src/util/virnetdev.h
View File

@ -98,9 +98,9 @@ int virNetDevAddRoute(const char *ifname,
unsigned int metric) unsigned int metric)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4)
ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_RETURN_CHECK;
int virNetDevClearIPv4Address(const char *ifname, int virNetDevClearIPAddress(const char *ifname,
virSocketAddr *addr, virSocketAddr *addr,
unsigned int prefix) unsigned int prefix)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
int virNetDevGetIPv4Address(const char *ifname, virSocketAddrPtr addr) int virNetDevGetIPv4Address(const char *ifname, virSocketAddrPtr addr)
ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;