File 7100be40-lxc-conf2xml-convert-hostdev-ips.patch of Package libvirt.11411

From 7100be40a593b82041bf7a181ea42ba62daa7c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Bosdonnat?= <cbosdonnat@suse.com>
Date: Wed, 23 Jul 2014 18:00:12 +0200
Subject: [PATCH 11/17] lxc conf2xml: convert ip addresses for hostdev NICs

---
 src/lxc/lxc_native.c                                 | 3 +++
 tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config | 2 ++
 tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml    | 2 ++
 3 files changed, 7 insertions(+)

Index: libvirt-1.2.5/src/lxc/lxc_native.c
===================================================================
--- libvirt-1.2.5.orig/src/lxc/lxc_native.c
+++ libvirt-1.2.5/src/lxc/lxc_native.c
@@ -461,6 +461,9 @@ lxcAddNetworkDefinition(lxcNetworkParseD
                 goto error;
         }
 
+        hostdev->source.caps.u.net.ips = data->ips;
+        hostdev->source.caps.u.net.nips = data->nips;
+
         if (VIR_EXPAND_N(data->def->hostdevs, data->def->nhostdevs, 1) < 0)
             goto error;
         data->def->hostdevs[data->def->nhostdevs - 1] = hostdev;
Index: libvirt-1.2.5/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config
===================================================================
--- libvirt-1.2.5.orig/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config
+++ libvirt-1.2.5/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config
@@ -1,6 +1,8 @@
 lxc.network.type = phys
 lxc.network.link = eth0
 lxc.network.name = eth1
+lxc.network.ipv4 = 192.168.122.2/24
+lxc.network.ipv6 = 2003:db8:1:0:214:1234:fe0b:3596/64
 
 lxc.rootfs = /var/lib/lxc/migrate_test/rootfs
 lxc.utsname = migrate_test
Index: libvirt-1.2.5/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
===================================================================
--- libvirt-1.2.5.orig/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
+++ libvirt-1.2.5/tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml
@@ -25,6 +25,8 @@
       <source>
         <interface>eth0</interface>
       </source>
+      <ip address='192.168.122.2' family='ipv4' prefix='24'/>
+      <ip address='2003:db8:1:0:214:1234:fe0b:3596' family='ipv6' prefix='64'/>
     </hostdev>
   </devices>
 </domain>