External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Remove need for qemuMonitorIOThreadInfoFree

Browse Source 
Replace with just VIR_FREE.
This commit is contained in:
John Ferlan 2015-04-28 06:32:52 -04:00
parent 69b16513a5
commit b515339fe7
6 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_driver.c
View File

@ -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,

9
src/qemu/qemu_monitor.c
View File

@ -3813,15 +3813,6 @@ qemuMonitorGetIOThreads(qemuMonitorPtr mon,
}
void
qemuMonitorIOThreadInfoFree(qemuMonitorIOThreadInfoPtr iothread)
{
if (!iothread)
return;
VIR_FREE(iothread);
}
/**
* qemuMonitorGetMemoryDeviceInfo:
* @mon: pointer to the monitor

2
src/qemu/qemu_monitor.h
View File

@ -883,8 +883,6 @@ struct _qemuMonitorIOThreadInfo {
int qemuMonitorGetIOThreads(qemuMonitorPtr mon,
qemuMonitorIOThreadInfoPtr **iothreads);
void qemuMonitorIOThreadInfoFree(qemuMonitorIOThreadInfoPtr iothread);
typedef struct _qemuMonitorMemoryDeviceInfo qemuMonitorMemoryDeviceInfo;
typedef qemuMonitorMemoryDeviceInfo *qemuMonitorMemoryDeviceInfoPtr;

2
src/qemu/qemu_monitor_json.c
View File

@ -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);

2
src/qemu/qemu_process.c
View File

@ -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;

2
tests/qemumonitorjsontest.c
View File

@ -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;