From: Ján Tomko <jtomko@redhat.com>
Date: Mon, 10 Nov 2014 16:40:07 +0000 (+0100)
Subject: Silently ignore MAC in NetworkLoadConfig
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c9c7a2bd964d02f1c1ffc542cb18bf851852dd37;p=libvirt.git

Silently ignore MAC in NetworkLoadConfig

Libvirt's RPMs have been adding it to networks which don't support it.

https://bugzilla.redhat.com/show_bug.cgi?id=1156367
---

diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
index a249e32c1b..5052f7c2e7 100644
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -3144,6 +3144,10 @@ virNetworkObjPtr virNetworkLoadConfig(virNetworkObjListPtr nets,
          */
         if (virNetworkSetBridgeName(nets, def, 0))
             goto error;
+    } else {
+        /* Throw away MAC address for other forward types,
+         * which could have been generated by older libvirt RPMs */
+        def->mac_specified = false;
     }
 
     if (!(net = virNetworkAssignDef(nets, def, false)))