1:39 p.m.
This function only frees the info for one thread.
---
daemon/remote.c | 2 +-
include/libvirt/libvirt-domain.h | 2 +-
src/libvirt-domain.c | 6 +++---
src/libvirt_public.syms | 2 +-
src/qemu/qemu_driver.c | 4 ++--
src/remote/remote_driver.c | 2 +-
tools/virsh-domain.c | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/daemon/remote.c b/daemon/remote.c
index ea7ae94..be0febb 100644
--- a/daemon/remote.c
+++ b/daemon/remote.c
@@ -2334,7 +2334,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 5d1d868..94b55b7 100644
--- 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 0bd9274..73ab56d 100644
--- 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 e4cf7ed..7163969 100644
--- 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 2c55fb0..f5c234e 100644
--- 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 e69f235..7172ada 100644
--- 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 1d8225c..0713b93 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -6868,7 +6868,7 @@ cmdIOThreadsInfo(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);
--
2.0.5