From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 27 Jun 2016 09:56:17 +0000 (+0200)
Subject: Revert "lxc: support setting host-side IP addresses/routes"
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1549f16832ca23918b651fb4985a2e9f257cd429;p=libvirt.git

Revert "lxc: support setting host-side IP addresses/routes"

This reverts commit cd5c9f21ded4f8e6216eba02b8795f70503ab404.

This feature was accidentally pushed in the feature freeze.
---

diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c
index 28313f0f77..07eb22af02 100644
--- a/src/lxc/lxc_process.c
+++ b/src/lxc/lxc_process.c
@@ -304,14 +304,6 @@ 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;