conf: Unexport virDomainHostdevDefClear

Move it before its first usage and make it static.

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

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 3ab7cd2666275df37f433156831c592532301045..45c22b24ecf79059a1ceb4715007cd7302f937ca 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2587,6 +2587,75 @@ void virDomainFSDefFree(virDomainFSDef *def)
     g_free(def);
 }
 
+
+static void
+virDomainHostdevSubsysSCSIClear(virDomainHostdevSubsysSCSI *scsisrc)
+{
+    if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
+        g_clear_pointer(&scsisrc->u.iscsi.src, virObjectUnref);
+    } else {
+        VIR_FREE(scsisrc->u.host.adapter);
+        g_clear_pointer(&scsisrc->u.host.src, virObjectUnref);
+    }
+}
+
+
+static void
+virDomainHostdevDefClear(virDomainHostdevDef *def)
+{
+    if (!def)
+        return;
+
+    /* Free all resources in the hostdevdef. Currently the only
+     * such resource is the virDomainDeviceInfo.
+     */
+
+    /* If there is a parentnet device object, it will handle freeing
+     * def->info.
+     */
+    if (!def->parentnet)
+        virDomainDeviceInfoFree(def->info);
+
+    virDomainNetTeamingInfoFree(def->teaming);
+
+    switch (def->mode) {
+    case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES:
+        switch ((virDomainHostdevCapsType) def->source.caps.type) {
+        case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE:
+            VIR_FREE(def->source.caps.u.storage.block);
+            break;
+        case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC:
+            VIR_FREE(def->source.caps.u.misc.chardev);
+            break;
+        case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET:
+            VIR_FREE(def->source.caps.u.net.ifname);
+            virNetDevIPInfoClear(&def->source.caps.u.net.ip);
+            break;
+        case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST:
+            break;
+        }
+        break;
+    case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS:
+        switch ((virDomainHostdevSubsysType) def->source.subsys.type) {
+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
+            virDomainHostdevSubsysSCSIClear(&def->source.subsys.u.scsi);
+            break;
+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
+            VIR_FREE(def->source.subsys.u.scsi_host.wwpn);
+            break;
+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
+            g_clear_pointer(&def->source.subsys.u.pci.origstates, virBitmapFree);
+            break;
+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+            break;
+        }
+        break;
+    }
+}
+
+
 void
 virDomainActualNetDefFree(virDomainActualNetDef *def)
 {
@@ -3327,72 +3396,6 @@ virDomainHostdevDefNew(void)
 }
 
 
-static void
-virDomainHostdevSubsysSCSIClear(virDomainHostdevSubsysSCSI *scsisrc)
-{
-    if (scsisrc->protocol == VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI) {
-        g_clear_pointer(&scsisrc->u.iscsi.src, virObjectUnref);
-    } else {
-        VIR_FREE(scsisrc->u.host.adapter);
-        g_clear_pointer(&scsisrc->u.host.src, virObjectUnref);
-    }
-}
-
-
-void virDomainHostdevDefClear(virDomainHostdevDef *def)
-{
-    if (!def)
-        return;
-
-    /* Free all resources in the hostdevdef. Currently the only
-     * such resource is the virDomainDeviceInfo.
-     */
-
-    /* If there is a parentnet device object, it will handle freeing
-     * def->info.
-     */
-    if (!def->parentnet)
-        virDomainDeviceInfoFree(def->info);
-
-    virDomainNetTeamingInfoFree(def->teaming);
-
-    switch (def->mode) {
-    case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES:
-        switch ((virDomainHostdevCapsType) def->source.caps.type) {
-        case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE:
-            VIR_FREE(def->source.caps.u.storage.block);
-            break;
-        case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_MISC:
-            VIR_FREE(def->source.caps.u.misc.chardev);
-            break;
-        case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET:
-            VIR_FREE(def->source.caps.u.net.ifname);
-            virNetDevIPInfoClear(&def->source.caps.u.net.ip);
-            break;
-        case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST:
-            break;
-        }
-        break;
-    case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS:
-        switch ((virDomainHostdevSubsysType) def->source.subsys.type) {
-        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
-            virDomainHostdevSubsysSCSIClear(&def->source.subsys.u.scsi);
-            break;
-        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
-            VIR_FREE(def->source.subsys.u.scsi_host.wwpn);
-            break;
-        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
-            g_clear_pointer(&def->source.subsys.u.pci.origstates, virBitmapFree);
-            break;
-        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
-        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
-        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
-            break;
-        }
-        break;
-    }
-}
-
 static virDomainTPMDef *
 virDomainTPMDefNew(virDomainXMLOption *xmlopt)
 {

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 5a2c70f012f8434ca44972093bbc49d8ecc21a75..bd6b7a1a19aaa2797c4f58b3e47962b9e67d4f2c 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3574,7 +3574,6 @@ void virDomainVideoDefFree(virDomainVideoDef *def);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainVideoDef, virDomainVideoDefFree);
 void virDomainVideoDefClear(virDomainVideoDef *def);
 virDomainHostdevDef *virDomainHostdevDefNew(void);
-void virDomainHostdevDefClear(virDomainHostdevDef *def);
 void virDomainHostdevDefFree(virDomainHostdevDef *def);
 void virDomainHubDefFree(virDomainHubDef *def);
 void virDomainRedirdevDefFree(virDomainRedirdevDef *def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 87c3bab64fae0e5faedea7ca9700d92fabdff35e..2cd975a8a468bdacaf0c7e9f3daa80b8ff510a07 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -461,7 +461,6 @@ virDomainGraphicsVNCSharePolicyTypeFromString;
 virDomainGraphicsVNCSharePolicyTypeToString;
 virDomainHasNet;
 virDomainHostdevCapsTypeToString;
-virDomainHostdevDefClear;
 virDomainHostdevDefFree;
 virDomainHostdevDefNew;
 virDomainHostdevFind;