From 5dd52ecbcf3cbc194400ce56479ecd99798d1c6b Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 2 Jun 2020 16:09:23 +0200 Subject: [PATCH] domain_conf: Format NS always last MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I think that since is kind of a hack, it doesn't deserve place in the front row. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrangé --- src/conf/domain_conf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1cdc7971fc..e84fbe1e21 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29877,16 +29877,16 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def, for (n = 0; n < def->nseclabels; n++) virSecurityLabelDefFormat(buf, def->seclabels[n], flags); - if (def->namespaceData && def->ns.format) { - if ((def->ns.format)(buf, def->namespaceData) < 0) - goto error; - } - if (def->keywrap) virDomainKeyWrapDefFormat(buf, def->keywrap); virDomainSEVDefFormat(buf, def->sev); + if (def->namespaceData && def->ns.format) { + if ((def->ns.format)(buf, def->namespaceData) < 0) + goto error; + } + virBufferAdjustIndent(buf, -2); virBufferAsprintf(buf, "\n", rootname);