From: Michal Privoznik <mprivozn@redhat.com>
Date: Wed, 7 Jun 2017 15:52:40 +0000 (+0200)
Subject: virDomainNetDefParseXML: Fix typo
X-Git-Tag: v3.5.0-rc1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=836f85d13f363306c37ccf735a3a0074690f7c86;p=thirdparty%2Flibvirt.git

virDomainNetDefParseXML: Fix typo

In 9cb891141c we've introduced some logic to clearing suggested
macvtap/macvlan ifnames. The logic consists of comparing ifname
string with strings that libvirt would generate. However, due to
a typo only VIR_NET_GENERATED_MACVTAP_PREFIX was compared. Twice.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2e2e7334ab..3e884225b3 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10074,7 +10074,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
         if (ifname &&
             flags & VIR_DOMAIN_DEF_PARSE_INACTIVE &&
             (STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) ||
-             STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX))) {
+             STRPREFIX(ifname, VIR_NET_GENERATED_MACVLAN_PREFIX))) {
             VIR_FREE(ifname);
         }