提交 cf8b828a 编写于 作者: J Ján Tomko

Rename virDomainIOThreadsInfoFree to virDomainIOThreadInfoFree

This function only frees the info for one thread.
上级 fa67489d
...@@ -2335,7 +2335,7 @@ remoteDispatchDomainGetIOThreadsInfo(virNetServerPtr server ATTRIBUTE_UNUSED, ...@@ -2335,7 +2335,7 @@ remoteDispatchDomainGetIOThreadsInfo(virNetServerPtr server ATTRIBUTE_UNUSED,
virObjectUnref(dom); virObjectUnref(dom);
if (ninfo >= 0) if (ninfo >= 0)
for (i = 0; i < ninfo; i++) for (i = 0; i < ninfo; i++)
virDomainIOThreadsInfoFree(info[i]); virDomainIOThreadInfoFree(info[i]);
VIR_FREE(info); VIR_FREE(info);
return rv; return rv;
......
...@@ -1605,7 +1605,7 @@ struct _virDomainIOThreadInfo { ...@@ -1605,7 +1605,7 @@ struct _virDomainIOThreadInfo {
int cpumaplen; /* cpumap size */ int cpumaplen; /* cpumap size */
}; };
void virDomainIOThreadsInfoFree(virDomainIOThreadInfoPtr info); void virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info);
int virDomainGetIOThreadsInfo(virDomainPtr domain, int virDomainGetIOThreadsInfo(virDomainPtr domain,
virDomainIOThreadInfoPtr **info, virDomainIOThreadInfoPtr **info,
......
...@@ -7906,7 +7906,7 @@ virDomainGetMaxVcpus(virDomainPtr domain) ...@@ -7906,7 +7906,7 @@ virDomainGetMaxVcpus(virDomainPtr domain)
* *
* Returns the number of IOThreads or -1 in case of error. * Returns the number of IOThreads or -1 in case of error.
* On success, the array of information is stored into @info. The caller is * 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. * then calling free() on @info. On error, @info is set to NULL.
*/ */
int int
...@@ -7949,13 +7949,13 @@ virDomainGetIOThreadsInfo(virDomainPtr dom, ...@@ -7949,13 +7949,13 @@ virDomainGetIOThreadsInfo(virDomainPtr dom,
/** /**
* virDomainIOThreadsInfoFree: * virDomainIOThreadInfoFree:
* @info: pointer to a virDomainIOThreadInfo object * @info: pointer to a virDomainIOThreadInfo object
* *
* Frees the memory used by @info. * Frees the memory used by @info.
*/ */
void void
virDomainIOThreadsInfoFree(virDomainIOThreadInfoPtr info) virDomainIOThreadInfoFree(virDomainIOThreadInfoPtr info)
{ {
if (!info) if (!info)
return; return;
......
...@@ -697,7 +697,7 @@ LIBVIRT_1.2.12 { ...@@ -697,7 +697,7 @@ LIBVIRT_1.2.12 {
LIBVIRT_1.2.14 { LIBVIRT_1.2.14 {
global: global:
virDomainIOThreadsInfoFree; virDomainIOThreadInfoFree;
virDomainGetIOThreadsInfo; virDomainGetIOThreadsInfo;
virDomainPinIOThread; virDomainPinIOThread;
virDomainInterfaceAddresses; virDomainInterfaceAddresses;
......
...@@ -5788,7 +5788,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver, ...@@ -5788,7 +5788,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
cleanup: cleanup:
if (info_ret) { if (info_ret) {
for (i = 0; i < niothreads; i++) for (i = 0; i < niothreads; i++)
virDomainIOThreadsInfoFree(info_ret[i]); virDomainIOThreadInfoFree(info_ret[i]);
VIR_FREE(info_ret); VIR_FREE(info_ret);
} }
if (iothreads) { if (iothreads) {
...@@ -5859,7 +5859,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef, ...@@ -5859,7 +5859,7 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
cleanup: cleanup:
if (info_ret) { if (info_ret) {
for (i = 0; i < targetDef->iothreads; i++) for (i = 0; i < targetDef->iothreads; i++)
virDomainIOThreadsInfoFree(info_ret[i]); virDomainIOThreadInfoFree(info_ret[i]);
VIR_FREE(info_ret); VIR_FREE(info_ret);
} }
virBitmapFree(bitmap); virBitmapFree(bitmap);
......
...@@ -2382,7 +2382,7 @@ remoteDomainGetIOThreadsInfo(virDomainPtr dom, ...@@ -2382,7 +2382,7 @@ remoteDomainGetIOThreadsInfo(virDomainPtr dom,
cleanup: cleanup:
if (info_ret) { if (info_ret) {
for (i = 0; i < ret.info.info_len; i++) for (i = 0; i < ret.info.info_len; i++)
virDomainIOThreadsInfoFree(info_ret[i]); virDomainIOThreadInfoFree(info_ret[i]);
VIR_FREE(info_ret); VIR_FREE(info_ret);
} }
xdr_free((xdrproc_t)xdr_remote_domain_get_iothreads_info_ret, xdr_free((xdrproc_t)xdr_remote_domain_get_iothreads_info_ret,
......
...@@ -6868,7 +6868,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) ...@@ -6868,7 +6868,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd)
ignore_value(vshPrintPinInfo(info[i]->cpumap, info[i]->cpumaplen, ignore_value(vshPrintPinInfo(info[i]->cpumap, info[i]->cpumaplen,
maxcpu, 0)); maxcpu, 0));
vshPrint(ctl, "\n"); vshPrint(ctl, "\n");
virDomainIOThreadsInfoFree(info[i]); virDomainIOThreadInfoFree(info[i]);
} }
VIR_FREE(info); VIR_FREE(info);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册