Renamed virNetDevSetIPv4Address to virNetDevSetIPAddress

Renamed virNetDevSetIPv4Address as it also handles IPv6 addresses.

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 65862ec87f30cbcea455c7e344d2fcb656e6a1fd..98f773debe41fd3be668a89022ba0e4cf9f1c9b9 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1643,7 +1643,7 @@ virNetDevRxFilterFree;
 virNetDevRxFilterModeTypeFromString;
 virNetDevRxFilterModeTypeToString;
 virNetDevRxFilterNew;
-virNetDevSetIPv4Address;
+virNetDevSetIPAddress;
 virNetDevSetMAC;
 virNetDevSetMTU;
 virNetDevSetMTUFromDevice;

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 29222d074bfd633241dbdddb2a0f595e501458a1..6055c712a12c38fc3d96f2a3c79b53324727a9ec 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -1899,8 +1899,8 @@ networkAddAddrToBridge(virNetworkObjPtr network,
         return -1;
     }
 
-    if (virNetDevSetIPv4Address(network->def->bridge,
-                                &ipdef->address, prefix) < 0)
+    if (virNetDevSetIPAddress(network->def->bridge,
+                              &ipdef->address, prefix) < 0)
         return -1;
 
     return 0;

diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
index 9dfaadc1699fdf49fee4adb72d0773ab3b701649..26e5fa47d30b281342b789757e503e944dd5b146 100644 (file)
--- a/src/util/virnetdev.c
+++ b/src/util/virnetdev.c
@@ -907,7 +907,7 @@ virNetDevCreateNetlinkAddressMessage(int messageType,
 }
 
 /**
- * virNetDevSetIPv4Address:
+ * virNetDevSetIPAddress:
  * @ifname: the interface name
  * @addr: the IP address (IPv4 or IPv6)
  * @prefix: number of 1 bits in the netmask
@@ -918,9 +918,9 @@ virNetDevCreateNetlinkAddressMessage(int messageType,
  *
  * Returns 0 in case of success or -1 in case of error.
  */
-int virNetDevSetIPv4Address(const char *ifname,
-                            virSocketAddr *addr,
-                            unsigned int prefix)
+int virNetDevSetIPAddress(const char *ifname,
+                          virSocketAddr *addr,
+                          unsigned int prefix)
 {
     virSocketAddr *broadcast = NULL;
     int ret = -1;
@@ -965,9 +965,9 @@ int virNetDevSetIPv4Address(const char *ifname,
 
 #else /* defined(__linux__) && defined(HAVE_LIBNL) */
 
-int virNetDevSetIPv4Address(const char *ifname,
-                            virSocketAddr *addr,
-                            unsigned int prefix)
+int virNetDevSetIPAddress(const char *ifname,
+                          virSocketAddr *addr,
+                          unsigned int prefix)
 {
     virCommandPtr cmd = NULL;
     char *addrstr = NULL, *bcaststr = NULL;

diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h
index 2791b0d27762e7aa0b51fe742a9ab1f4cda9fbfc..14d6a797a4426e411ee1bb808ccc87cbb35ac93b 100644 (file)
--- a/src/util/virnetdev.h
+++ b/src/util/virnetdev.h
@@ -87,9 +87,9 @@ int virNetDevIsOnline(const char *ifname,
                       bool *online)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 
-int virNetDevSetIPv4Address(const char *ifname,
-                            virSocketAddr *addr,
-                            unsigned int prefix)
+int virNetDevSetIPAddress(const char *ifname,
+                          virSocketAddr *addr,
+                          unsigned int prefix)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK;
 int virNetDevAddRoute(const char *ifname,
                       virSocketAddrPtr addr,