Rename virDomainIOThreadsInfoFree to virDomainIOThreadInfoFree

This function only frees the info for one thread.

diff --git a/daemon/remote.c b/daemon/remote.c
index 9e28720937bed8cd5f6ef6bfa5c5822e86ae679c..e6ba68038e2d45770446e1fbd3825b4b457221ff 100644 (file)
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2335,7 +2335,7 @@ remoteDispatchDomainGetIOThreadsInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
     virObjectUnref(dom);
     if (ninfo >= 0)
         for (i = 0; i < ninfo; i++)
-            virDomainIOThreadsInfoFree(info[i]);
+            virDomainIOThreadInfoFree(info[i]);
     VIR_FREE(info);
 
     return rv;

diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
index 5d1d86808d87a5072613705b5a5ff9d6f8e50e7a..94b55b7c6886c3a6b5c85ea3ea07b3c127f3cc72 100644 (file)
--- a/include/libvirt/libvirt-domain.h
+++ b/include/libvirt/libvirt-domain.h
@@ -1605,7 +1605,7 @@ struct _virDomainIOThreadInfo {
     int cpumaplen;                     /* cpumap size */
 };
 
-void                 virDomainIOThreadsInfoFree(virDomainIOThreadInfoPtr info);
+void                 virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info);
 
 int                  virDomainGetIOThreadsInfo(virDomainPtr domain,
                                                virDomainIOThreadInfoPtr **info,

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 0bd9274be8e89e5b9c0fcf54bf312e65162f6cdd..73ab56dae3a709159ba5fe9b768b4362dc19c480 100644 (file)
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -7906,7 +7906,7 @@ virDomainGetMaxVcpus(virDomainPtr domain)
  *
  * Returns the number of IOThreads or -1 in case of error.
  * On success, the array of information is stored into @info. The caller is
- * responsible for calling virDomainIOThreadsInfoFree() on each array element,
+ * responsible for calling virDomainIOThreadInfoFree() on each array element,
  * then calling free() on @info. On error, @info is set to NULL.
  */
 int
@@ -7949,13 +7949,13 @@ virDomainGetIOThreadsInfo(virDomainPtr dom,
 
 
 /**
- * virDomainIOThreadsInfoFree:
+ * virDomainIOThreadInfoFree:
  * @info: pointer to a virDomainIOThreadInfo object
  *
  * Frees the memory used by @info.
  */
 void
-virDomainIOThreadsInfoFree(virDomainIOThreadInfoPtr info)
+virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info)
 {
     if (!info)
         return;

diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
index e4cf7ed24dc22b00aae6cbe244ae4f27eaa21f0c..71639695b632bd07bca88bd6f6eee793325e993d 100644 (file)
--- a/src/libvirt_public.syms
+++ b/src/libvirt_public.syms
@@ -697,7 +697,7 @@ LIBVIRT_1.2.12 {
 
 LIBVIRT_1.2.14 {
     global:
-        virDomainIOThreadsInfoFree;
+        virDomainIOThreadInfoFree;
         virDomainGetIOThreadsInfo;
         virDomainPinIOThread;
         virDomainInterfaceAddresses;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 2c55fb0a8662659027c8c56c3d01baf3f0c1d933..f5c234ea0fec32847f1669656b83ae63ff7b3beb 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5788,7 +5788,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
  cleanup:
     if (info_ret) {
         for (i = 0; i < niothreads; i++)
-            virDomainIOThreadsInfoFree(info_ret[i]);
+            virDomainIOThreadInfoFree(info_ret[i]);
         VIR_FREE(info_ret);
     }
     if (iothreads) {
@@ -5859,7 +5859,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
  cleanup:
     if (info_ret) {
         for (i = 0; i < targetDef->iothreads; i++)
-            virDomainIOThreadsInfoFree(info_ret[i]);
+            virDomainIOThreadInfoFree(info_ret[i]);
         VIR_FREE(info_ret);
     }
     virBitmapFree(bitmap);

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index e69f2356f112f181ddace7c3f413379ca1f9fcc0..7172ada8ea50008c714a1554ed483e6ef37c3566 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -2382,7 +2382,7 @@ remoteDomainGetIOThreadsInfo(virDomainPtr dom,
  cleanup:
     if (info_ret) {
         for (i = 0; i < ret.info.info_len; i++)
-            virDomainIOThreadsInfoFree(info_ret[i]);
+            virDomainIOThreadInfoFree(info_ret[i]);
         VIR_FREE(info_ret);
     }
     xdr_free((xdrproc_t)xdr_remote_domain_get_iothreads_info_ret,

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 48a281ef2f9852d8883b7a3aaa342bb14990651a..79b411500a9e3f398badcbca4ec27099691bc79a 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6868,7 +6868,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd)
         ignore_value(vshPrintPinInfo(info[i]->cpumap, info[i]->cpumaplen,
                                      maxcpu, 0));
         vshPrint(ctl, "\n");
-        virDomainIOThreadsInfoFree(info[i]);
+        virDomainIOThreadInfoFree(info[i]);
     }
     VIR_FREE(info);