From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 17 Jun 2019 13:07:00 +0000 (+0200)
Subject: qemu: Move qemuDomainXmlNsDef(Free) from qemu_conf.(ch)
X-Git-Tag: v5.5.0-rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a967b2f0bdd7d6ffc755d94b133c8faa0751073d;p=thirdparty%2Flibvirt.git

qemu: Move qemuDomainXmlNsDef(Free) from qemu_conf.(ch)

qemu_conf.c deals with the configuration file. Better fit for the
structure and freeing function will be qemu_domain.c where the rest of
the namespace parsing/formatting stuff resides.

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

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index afff77b1f3..d981001600 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -94,26 +94,6 @@ qemuDriverUnlock(virQEMUDriverPtr driver)
     virMutexUnlock(&driver->lock);
 }
 
-void qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def)
-{
-    size_t i;
-
-    if (!def)
-        return;
-
-    for (i = 0; i < def->num_args; i++)
-        VIR_FREE(def->args[i]);
-    for (i = 0; i < def->num_env; i++) {
-        VIR_FREE(def->env_name[i]);
-        VIR_FREE(def->env_value[i]);
-    }
-    VIR_FREE(def->args);
-    VIR_FREE(def->env_name);
-    VIR_FREE(def->env_value);
-    VIR_FREE(def);
-}
-
-
 #ifndef DEFAULT_LOADER_NVRAM
 # define DEFAULT_LOADER_NVRAM \
     "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 5debd7eb00..d638f1012d 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -288,21 +288,6 @@ struct _virQEMUDriver {
     virHashAtomicPtr migrationErrors;
 };
 
-typedef struct _qemuDomainXmlNsDef qemuDomainXmlNsDef;
-typedef qemuDomainXmlNsDef *qemuDomainXmlNsDefPtr;
-struct _qemuDomainXmlNsDef {
-    size_t num_args;
-    char **args;
-
-    unsigned int num_env;
-    char **env_name;
-    char **env_value;
-};
-
-
-
-void qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def);
-
 virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged);
 
 int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f775751093..45a22fe648 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3087,6 +3087,27 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks = {
 };
 
 
+static void
+qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def)
+{
+    size_t i;
+
+    if (!def)
+        return;
+
+    for (i = 0; i < def->num_args; i++)
+        VIR_FREE(def->args[i]);
+    for (i = 0; i < def->num_env; i++) {
+        VIR_FREE(def->env_name[i]);
+        VIR_FREE(def->env_value[i]);
+    }
+    VIR_FREE(def->args);
+    VIR_FREE(def->env_name);
+    VIR_FREE(def->env_value);
+    VIR_FREE(def);
+}
+
+
 static void
 qemuDomainDefNamespaceFree(void *nsdata)
 {
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 7223547e78..3b94f5a97c 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -529,6 +529,19 @@ struct _qemuDomainSaveCookie {
     virCPUDefPtr cpu;
 };
 
+
+typedef struct _qemuDomainXmlNsDef qemuDomainXmlNsDef;
+typedef qemuDomainXmlNsDef *qemuDomainXmlNsDefPtr;
+struct _qemuDomainXmlNsDef {
+    size_t num_args;
+    char **args;
+
+    unsigned int num_env;
+    char **env_name;
+    char **env_value;
+};
+
+
 qemuDomainSaveCookiePtr qemuDomainSaveCookieNew(virDomainObjPtr vm);
 
 const char *qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job,