From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 2 Jun 2020 14:09:23 +0000 (+0200)
Subject: domain_conf: Format NS always last
X-Git-Tag: v6.5.0-rc1~233
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd52ecbcf3cbc194400ce56479ecd99798d1c6b;p=thirdparty%2Flibvirt.git

domain_conf: Format NS always last

I think that since <qemu:commandline/> is kind of a hack, it
doesn't deserve place in the front row.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---

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, "</%s>\n", rootname);