From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 17 Jun 2019 14:45:06 +0000 (+0200)
Subject: qemu: domain: Split out commandline namespace data formatting
X-Git-Tag: v5.5.0-rc1~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ded974c3771cc424b2e0786bd4064940411835;p=thirdparty%2Flibvirt.git

qemu: domain: Split out commandline namespace data formatting

Separate it from qemuDomainDefNamespaceFormatXML.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4fe84253bc..0144ec61fd 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3228,15 +3228,15 @@ qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
     return ret;
 }
 
-static int
-qemuDomainDefNamespaceFormatXML(virBufferPtr buf,
-                                void *nsdata)
+
+static void
+qemuDomainDefNamespaceFormatXMLCommandline(virBufferPtr buf,
+                                           qemuDomainXmlNsDefPtr cmd)
 {
-    qemuDomainXmlNsDefPtr cmd = nsdata;
     size_t i;
 
     if (!cmd->num_args && !cmd->num_env)
-        return 0;
+        return;
 
     virBufferAddLit(buf, "<qemu:commandline>\n");
     virBufferAdjustIndent(buf, 2);
@@ -3253,6 +3253,17 @@ qemuDomainDefNamespaceFormatXML(virBufferPtr buf,
 
     virBufferAdjustIndent(buf, -2);
     virBufferAddLit(buf, "</qemu:commandline>\n");
+}
+
+
+static int
+qemuDomainDefNamespaceFormatXML(virBufferPtr buf,
+                                void *nsdata)
+{
+    qemuDomainXmlNsDefPtr cmd = nsdata;
+
+    qemuDomainDefNamespaceFormatXMLCommandline(buf, cmd);
+
     return 0;
 }