lxc: support setting host-side IP addresses/routes

(This patch had been pushed earlier in
commit cd5c9f21ded4f8e6216eba02b8795f70503ab404, but was reverted in
commit 1549f16832ca23918b651fb4985a2e9f257cd429 because it had been
accidentally pushed during the freeze for release 2.0.0)

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 07eb22af023112d43ef0bb911d8d9577c506f4c2..28313f0f77a90676a6aa1cc647e5c5e261729e8b 100644 (file)
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -304,6 +304,14 @@ virLXCProcessSetupInterfaceTap(virDomainDefPtr vm,
     if (virNetDevSetOnline(parentVeth, true) < 0)
         goto cleanup;
 
+    if (virDomainNetGetActualType(net) == VIR_DOMAIN_NET_TYPE_ETHERNET) {
+        /* Set IP info for the host side, but only if the type is
+         * 'ethernet'.
+         */
+        if (virNetDevIPInfoAddToDev(parentVeth, &net->hostIP) < 0)
+            goto cleanup;
+    }
+
     if (net->filter &&
         virDomainConfNWFilterInstantiate(vm->uuid, net) < 0)
         goto cleanup;