conf: Rename virDomainDiskHostDefFree to virDomainDiskHostDefClear

The function destroys only the contents not the object itself thus it
should be called Clear.

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7ecb21f15b0142408638e9338973a47bab4594e2..c5fe9e2cf0bea3bc248c4790e9f682239a8b7e0e 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -1217,13 +1217,13 @@ void virDomainDiskDefFree(virDomainDiskDefPtr def)
     }
 
     for (i = 0; i < def->nhosts; i++)
-        virDomainDiskHostDefFree(&def->hosts[i]);
+        virDomainDiskHostDefClear(&def->hosts[i]);
     VIR_FREE(def->hosts);
 
     VIR_FREE(def);
 }
 
-void virDomainDiskHostDefFree(virDomainDiskHostDefPtr def)
+void virDomainDiskHostDefClear(virDomainDiskHostDefPtr def)
 {
     if (!def)
         return;
@@ -4864,7 +4864,7 @@ error:
     VIR_FREE(protocol);
     VIR_FREE(transport);
     while (nhosts > 0) {
-        virDomainDiskHostDefFree(&hosts[nhosts - 1]);
+        virDomainDiskHostDefClear(&hosts[nhosts - 1]);
         nhosts--;
     }
 

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 05c2a84d306ac44f2b64423c0dfe7fbb0e1071c9..4561ccc55fa07426b396e55b378e834a71d470d0 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2209,7 +2209,7 @@ void virDomainGraphicsDefFree(virDomainGraphicsDefPtr def);
 void virDomainInputDefFree(virDomainInputDefPtr def);
 void virDomainDiskDefFree(virDomainDiskDefPtr def);
 void virDomainLeaseDefFree(virDomainLeaseDefPtr def);
-void virDomainDiskHostDefFree(virDomainDiskHostDefPtr def);
+void virDomainDiskHostDefClear(virDomainDiskHostDefPtr def);
 int virDomainDeviceFindControllerModel(virDomainDefPtr def,
                                        virDomainDeviceInfoPtr info,
                                        int controllerType);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 76016caff4c75f92830277a9fc901b117b28fd9c..a705c565308cdcf6669c799ff9e2aaeb410c11fe 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -197,7 +197,7 @@ virDomainDiskErrorPolicyTypeToString;
 virDomainDiskFindByBusAndDst;
 virDomainDiskGeometryTransTypeFromString;
 virDomainDiskGeometryTransTypeToString;
-virDomainDiskHostDefFree;
+virDomainDiskHostDefClear;
 virDomainDiskIndexByName;
 virDomainDiskInsert;
 virDomainDiskInsertPreAlloced;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1d693e1704c12507eb5e65d68081499754ff4f39..966aa0d15387ad97ab8a879e16c5c80677a0ac20 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -3517,7 +3517,7 @@ cleanup:
     return ret;
 
 error:
-    virDomainDiskHostDefFree(def->hosts);
+    virDomainDiskHostDefClear(def->hosts);
     VIR_FREE(def->hosts);
     goto cleanup;
 }
@@ -3619,7 +3619,7 @@ qemuParseNBDString(virDomainDiskDefPtr disk)
     return 0;
 
 error:
-    virDomainDiskHostDefFree(h);
+    virDomainDiskHostDefClear(h);
     VIR_FREE(h);
     return -1;
 }