Renamed virNetDevClearIPv4Address to virNetDevClearIPAddress

Make clear that virNetDevClearIPv4Address can also handle IPv6
addresses by changing the name

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 98f773debe41fd3be668a89022ba0e4cf9f1c9b9..514c3d435b5e32c3764410cb968a896895a56a58 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1618,7 +1618,7 @@ virMacAddrSetRaw;
 # util/virnetdev.h
 virNetDevAddMulti;
 virNetDevAddRoute;
-virNetDevClearIPv4Address;
+virNetDevClearIPAddress;
 virNetDevDelMulti;
 virNetDevExists;
 virNetDevGetIndex;

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 0948e7b68ab3af323cd8d11ae4479644120828a4..64c14e011831681782fa4ebe4a35a41561c28968 100644 (file)
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -1053,7 +1053,7 @@ virNetDevAddRoute(const char *ifname,
 }
 
 /**
- * virNetDevClearIPv4Address:
+ * virNetDevClearIPAddress:
  * @ifname: the interface name
  * @addr: the IP address (IPv4 or IPv6)
  * @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.
  */
-int virNetDevClearIPv4Address(const char *ifname,
-                              virSocketAddr *addr,
-                              unsigned int prefix)
+int virNetDevClearIPAddress(const char *ifname,
+                            virSocketAddr *addr,
+                            unsigned int prefix)
 {
     int ret = -1;
     struct nl_msg *nlmsg = NULL;
@@ -1176,9 +1176,9 @@ virNetDevAddRoute(const char *ifname,
     return ret;
 }
 
-int virNetDevClearIPv4Address(const char *ifname,
-                              virSocketAddr *addr,
-                              unsigned int prefix)
+int virNetDevClearIPAddress(const char *ifname,
+                            virSocketAddr *addr,
+                            unsigned int prefix)
 {
     virCommandPtr cmd = NULL;
     char *addrstr;

diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 14d6a797a4426e411ee1bb808ccc87cbb35ac93b..19e17cf58ec933a8c57594a9cc44d10cc8bdf12c 100644 (file)
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -98,9 +98,9 @@ int virNetDevAddRoute(const char *ifname,
                       unsigned int metric)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4)
     ATTRIBUTE_RETURN_CHECK;
-int virNetDevClearIPv4Address(const char *ifname,
-                              virSocketAddr *addr,
-                              unsigned int prefix)
+int virNetDevClearIPAddress(const char *ifname,
+                            virSocketAddr *addr,
+                            unsigned int prefix)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 int virNetDevGetIPv4Address(const char *ifname, virSocketAddrPtr addr)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;