File 2b0598c8-rename-virNetDevSetIPv4Address.patch of Package libvirt.11411

From 2b0598c836748fc528b8000a433b8381f0762e86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Tue, 5 Aug 2014 19:25:40 +0200
Subject: [PATCH 03/17] Renamed virNetDevSetIPv4Address to
 virNetDevSetIPAddress

Renamed virNetDevSetIPv4Address as it also handles IPv6 addresses.
---
 src/libvirt_private.syms    |  2 +-
 src/network/bridge_driver.c |  4 ++--
 src/util/virnetdev.c        | 14 +++++++-------
 src/util/virnetdev.h        |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

Index: libvirt-1.2.5/src/libvirt_private.syms
===================================================================
--- libvirt-1.2.5.orig/src/libvirt_private.syms
+++ libvirt-1.2.5/src/libvirt_private.syms
@@ -1555,7 +1555,7 @@ virNetDevReplaceMacAddress;
 virNetDevReplaceNetConfig;
 virNetDevRestoreMacAddress;
 virNetDevRestoreNetConfig;
-virNetDevSetIPv4Address;
+virNetDevSetIPAddress;
 virNetDevSetMAC;
 virNetDevSetMTU;
 virNetDevSetMTUFromDevice;
Index: libvirt-1.2.5/src/network/bridge_driver.c
===================================================================
--- libvirt-1.2.5.orig/src/network/bridge_driver.c
+++ libvirt-1.2.5/src/network/bridge_driver.c
@@ -1874,8 +1874,8 @@ networkAddAddrToBridge(virNetworkObjPtr
         return -1;
     }
 
-    if (virNetDevSetIPv4Address(network->def->bridge,
-                                &ipdef->address, prefix) < 0)
+    if (virNetDevSetIPAddress(network->def->bridge,
+                              &ipdef->address, prefix) < 0)
         return -1;
 
     return 0;
Index: libvirt-1.2.5/src/util/virnetdev.c
===================================================================
--- libvirt-1.2.5.orig/src/util/virnetdev.c
+++ libvirt-1.2.5/src/util/virnetdev.c
@@ -870,7 +870,7 @@ virNetDevCreateNetlinkAddressMessage(int
 }
 
 /**
- * virNetDevSetIPv4Address:
+ * virNetDevSetIPAddress:
  * @ifname: the interface name
  * @addr: the IP address (IPv4 or IPv6)
  * @prefix: number of 1 bits in the netmask
@@ -881,9 +881,9 @@ virNetDevCreateNetlinkAddressMessage(int
  *
  * 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;
@@ -928,9 +928,9 @@ int virNetDevSetIPv4Address(const char *
 
 #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;
Index: libvirt-1.2.5/src/util/virnetdev.h
===================================================================
--- libvirt-1.2.5.orig/src/util/virnetdev.h
+++ libvirt-1.2.5/src/util/virnetdev.h
@@ -50,9 +50,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,