提交 b515339f 编写于 作者: J John Ferlan

qemu: Remove need for qemuMonitorIOThreadInfoFree

Replace with just VIR_FREE.
上级 69b16513
......@@ -5950,7 +5950,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
}
if (iothreads) {
for (i = 0; i < niothreads; i++)
qemuMonitorIOThreadInfoFree(iothreads[i]);
VIR_FREE(iothreads[i]);
VIR_FREE(iothreads);
}
......@@ -6330,7 +6330,7 @@ qemuDomainHotplugAddIOThread(virQEMUDriverPtr driver,
cleanup:
if (new_iothreads) {
for (idx = 0; idx < new_niothreads; idx++)
qemuMonitorIOThreadInfoFree(new_iothreads[idx]);
VIR_FREE(new_iothreads[idx]);
VIR_FREE(new_iothreads);
}
VIR_FREE(mem_mask);
......@@ -6416,7 +6416,7 @@ qemuDomainHotplugDelIOThread(virQEMUDriverPtr driver,
cleanup:
if (new_iothreads) {
for (idx = 0; idx < new_niothreads; idx++)
qemuMonitorIOThreadInfoFree(new_iothreads[idx]);
VIR_FREE(new_iothreads[idx]);
VIR_FREE(new_iothreads);
}
virDomainAuditIOThread(vm, orig_niothreads, new_niothreads,
......
......@@ -3813,15 +3813,6 @@ qemuMonitorGetIOThreads(qemuMonitorPtr mon,
}
void
qemuMonitorIOThreadInfoFree(qemuMonitorIOThreadInfoPtr iothread)
{
if (!iothread)
return;
VIR_FREE(iothread);
}
/**
* qemuMonitorGetMemoryDeviceInfo:
* @mon: pointer to the monitor
......
......@@ -883,8 +883,6 @@ struct _qemuMonitorIOThreadInfo {
int qemuMonitorGetIOThreads(qemuMonitorPtr mon,
qemuMonitorIOThreadInfoPtr **iothreads);
void qemuMonitorIOThreadInfoFree(qemuMonitorIOThreadInfoPtr iothread);
typedef struct _qemuMonitorMemoryDeviceInfo qemuMonitorMemoryDeviceInfo;
typedef qemuMonitorMemoryDeviceInfo *qemuMonitorMemoryDeviceInfoPtr;
......
......@@ -6518,7 +6518,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon,
cleanup:
if (ret < 0 && infolist) {
for (i = 0; i < n; i++)
qemuMonitorIOThreadInfoFree(infolist[i]);
VIR_FREE(infolist[i]);
VIR_FREE(infolist);
}
virJSONValueFree(cmd);
......
......@@ -2265,7 +2265,7 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver,
cleanup:
if (iothreads) {
for (i = 0; i < niothreads; i++)
qemuMonitorIOThreadInfoFree(iothreads[i]);
VIR_FREE(iothreads[i]);
VIR_FREE(iothreads);
}
return ret;
......
......@@ -2295,7 +2295,7 @@ testQemuMonitorJSONGetIOThreads(const void *data)
cleanup:
qemuMonitorTestFree(test);
for (i = 0; i < ninfo; i++)
qemuMonitorIOThreadInfoFree(info[i]);
VIR_FREE(info[i]);
VIR_FREE(info);
return ret;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册