[libvirt] [PATCH v2 3/3] qemu: Remove need for qemuMonitorIOThreadInfoFree
Replace with just VIR_FREE.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_driver.c | 6 +++---
src/qemu/qemu_monitor.c | 9 ---------
src/qemu/qemu_monitor.h | 2 --
src/qemu/qemu_monitor_json.c | 2 +-
src/qemu/qemu_process.c | 2 +-
tests/qemumonitorjsontest.c | 2 +-
6 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d0147e9..80463f2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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,
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 48bfeb0..6be3ca2 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3813,15 +3813,6 @@ qemuMonitorGetIOThreads(qemuMonitorPtr mon,
}
-void
-qemuMonitorIOThreadInfoFree(qemuMonitorIOThreadInfoPtr iothread)
-{
- if (!iothread)
- return;
- VIR_FREE(iothread);
-}
-
-
/**
* qemuMonitorGetMemoryDeviceInfo:
* @mon: pointer to the monitor
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index bce8031..a07e43b 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -883,8 +883,6 @@ struct _qemuMonitorIOThreadInfo {
int qemuMonitorGetIOThreads(qemuMonitorPtr mon,
qemuMonitorIOThreadInfoPtr **iothreads);
-void qemuMonitorIOThreadInfoFree(qemuMonitorIOThreadInfoPtr iothread);
-
typedef struct _qemuMonitorMemoryDeviceInfo qemuMonitorMemoryDeviceInfo;
typedef qemuMonitorMemoryDeviceInfo *qemuMonitorMemoryDeviceInfoPtr;
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index c02ef47..e281140 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -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);
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index d8a747c..605b3c6 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -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;
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 39eeaa7..c6379b6 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -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;
--
2.1.0