From: Laine Stump <laine@laine.org>
Date: Fri, 10 Jun 2016 16:37:37 +0000 (-0400)
Subject: util: support setting peer for virNetDevIPInfo addresses
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d83cac49e38ca4f3baa48aa95a802c0e78861500;p=libvirt.git

util: support setting peer for virNetDevIPInfo addresses

This will apply to any IP address setting that uses
virNetDevIPInfoAddToDev() (which so far is only the guest-side of LXC
type='ethernet' interfaces).

(This patch had been pushed earlier in
commit cb20f989df393ec97ba65afb06089d0ab87af484, but was reverted in
commit cba06aea8d500d4ea7e2f40272be484027dd3e4a because it had been
accidentally pushed during the freeze for release 2.0.0)
---

diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index ff0f2ddd36..d15976026c 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -920,7 +920,7 @@ virNetDevIPInfoAddToDev(const char *ifname,
             VIR_FREE(ipStr);
             goto cleanup;
         }
-        if (virNetDevIPAddrAdd(ifname, &ip->address, NULL, prefix) < 0)
+        if (virNetDevIPAddrAdd(ifname, &ip->address, &ip->peer, prefix) < 0)
             goto cleanup;
     }