]> xenbits.xensource.com Git - libvirt.git/commitdiff
Silently ignore MAC in NetworkLoadConfig
authorJán Tomko <jtomko@redhat.com>
Mon, 10 Nov 2014 16:40:07 +0000 (17:40 +0100)
committerJán Tomko <jtomko@redhat.com>
Tue, 2 Dec 2014 14:56:29 +0000 (15:56 +0100)
Libvirt's RPMs have been adding it to networks which don't support it.

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

src/conf/network_conf.c

index a249e32c1bdb3b07a8bc3f21207f623874432f86..5052f7c2e71807f4d807856af01db68d7308e80f 100644 (file)
@@ -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)))