]> xenbits.xensource.com Git - libvirt.git/commitdiff
domain_conf: Format NS always last
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 2 Jun 2020 14:09:23 +0000 (16:09 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 9 Jun 2020 13:20:12 +0000 (15:20 +0200)
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>
src/conf/domain_conf.c

index 1cdc7971fca6f4befdb5e750f7e1a1fa59552eeb..e84fbe1e212abda4516eac446761c307b0dab7d3 100644 (file)
@@ -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);