|
 |
c8c376 |
From 3457bed5d7caab62046ae6bc6dc70d152071d1f0 Mon Sep 17 00:00:00 2001
|
|
|
c8c376 |
Message-Id: <3457bed5d7caab62046ae6bc6dc70d152071d1f0@dist-git>
|
|
|
c8c376 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
c8c376 |
Date: Tue, 8 Nov 2016 13:42:01 +0100
|
|
|
c8c376 |
Subject: [PATCH] virDomainNetDefParseXML: Realign
|
|
|
c8c376 |
|
|
|
c8c376 |
RHEL-7.3: https://bugzilla.redhat.com/show_bug.cgi?id=1366108
|
|
|
c8c376 |
RHEL-7.3.z: https://bugzilla.redhat.com/show_bug.cgi?id=1392032
|
|
|
c8c376 |
|
|
|
c8c376 |
There are couple of formatting issues. No functional change
|
|
|
c8c376 |
though.
|
|
|
c8c376 |
|
|
|
c8c376 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
c8c376 |
(cherry picked from commit 94a10de26b1fa999dbb67cfeea8e3339205d9db6)
|
|
|
c8c376 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
c8c376 |
---
|
|
|
c8c376 |
src/conf/domain_conf.c | 8 ++++----
|
|
|
c8c376 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
c8c376 |
|
|
|
c8c376 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
c8c376 |
index 514e50d3b..23e447a4e 100644
|
|
|
c8c376 |
--- a/src/conf/domain_conf.c
|
|
|
c8c376 |
+++ b/src/conf/domain_conf.c
|
|
|
c8c376 |
@@ -9202,8 +9202,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
|
|
|
c8c376 |
ifname = virXMLPropString(cur, "dev");
|
|
|
c8c376 |
if (ifname &&
|
|
|
c8c376 |
(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
|
|
|
c8c376 |
- (STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX) ||
|
|
|
c8c376 |
- (prefix && STRPREFIX(ifname, prefix)))) {
|
|
|
c8c376 |
+ (STRPREFIX(ifname, VIR_NET_GENERATED_PREFIX) ||
|
|
|
c8c376 |
+ (prefix && STRPREFIX(ifname, prefix)))) {
|
|
|
c8c376 |
/* An auto-generated target name, blank it out */
|
|
|
c8c376 |
VIR_FREE(ifname);
|
|
|
c8c376 |
}
|
|
|
c8c376 |
@@ -9764,9 +9764,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
|
|
|
c8c376 |
filter = NULL;
|
|
|
c8c376 |
def->filterparams = filterparams;
|
|
|
c8c376 |
filterparams = NULL;
|
|
|
c8c376 |
- break;
|
|
|
c8c376 |
+ break;
|
|
|
c8c376 |
default:
|
|
|
c8c376 |
- break;
|
|
|
c8c376 |
+ break;
|
|
|
c8c376 |
}
|
|
|
c8c376 |
}
|
|
|
c8c376 |
|
|
|
c8c376 |
--
|
|
|
c8c376 |
2.11.0
|
|
|
c8c376 |
|