conf: eliminate virDomainNetDefClear()

This function is no longer used anywhere except virDomainNetDefFree(),
so just inline its contents there.

Signed-off-by: Laine Stump <laine@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f60d495407104e819ba48ae5c92f00c9d746beeb..7c9fb3494da7ee261c67485cb99d6bc955a55cdc 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2491,7 +2491,7 @@ virDomainVsockDefFree(virDomainVsockDefPtr vsock)
 
 
 void
-virDomainNetDefClear(virDomainNetDefPtr def)
+virDomainNetDefFree(virDomainNetDefPtr def)
 {
     if (!def)
         return;
@@ -2566,14 +2566,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
     virNetDevBandwidthFree(def->bandwidth);
     def->bandwidth = NULL;
     virNetDevVlanClear(&def->vlan);
-}
 
-void
-virDomainNetDefFree(virDomainNetDefPtr def)
-{
-    if (!def)
-        return;
-    virDomainNetDefClear(def);
     virObjectUnref(def->privateData);
     VIR_FREE(def);
 }

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 8f1662aae034901383b98d52a5b77f4b9192eb86..9a44315519be6bc58fb1516f69a100e570457c6a 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -3056,7 +3056,6 @@ void virDomainActualNetDefFree(virDomainActualNetDefPtr def);
 virDomainVsockDefPtr virDomainVsockDefNew(virDomainXMLOptionPtr xmlopt);
 void virDomainVsockDefFree(virDomainVsockDefPtr vsock);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainVsockDef, virDomainVsockDefFree);
-void virDomainNetDefClear(virDomainNetDefPtr def);
 void virDomainNetDefFree(virDomainNetDefPtr def);
 void virDomainSmartcardDefFree(virDomainSmartcardDefPtr def);
 void virDomainChrDefFree(virDomainChrDefPtr def);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6bcbfa667d0e01845de07c6acd9fdea7faeb5774..4e66385babab8d22989526493df919bde674da23 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -507,7 +507,6 @@ virDomainNetARPInterfaces;
 virDomainNetBandwidthUpdate;
 virDomainNetDefActualFromNetworkPort;
 virDomainNetDefActualToNetworkPort;
-virDomainNetDefClear;
 virDomainNetDefFormat;
 virDomainNetDefFree;
 virDomainNetDefNew;