1:39 p.m.
It only deals with a single thread.
---
src/qemu/qemu_driver.c | 4 ++--
src/qemu/qemu_monitor.c | 4 ++--
src/qemu/qemu_monitor.h | 10 +++++-----
src/qemu/qemu_monitor_json.c | 8 ++++----
src/qemu/qemu_monitor_json.h | 2 +-
src/qemu/qemu_process.c | 4 ++--
tests/qemumonitorjsontest.c | 4 ++--
7 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index f5c234e..b2597ce 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5715,7 +5715,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
virDomainIOThreadInfoPtr **info)
{
qemuDomainObjPrivatePtr priv;
- qemuMonitorIOThreadsInfoPtr *iothreads = NULL;
+ qemuMonitorIOThreadInfoPtr *iothreads = NULL;
virDomainIOThreadInfoPtr *info_ret = NULL;
int niothreads = 0;
int hostcpus;
@@ -5793,7 +5793,7 @@ qemuDomainGetIOThreadsLive(virQEMUDriverPtr driver,
}
if (iothreads) {
for (i = 0; i < niothreads; i++)
- qemuMonitorIOThreadsInfoFree(iothreads[i]);
+ qemuMonitorIOThreadInfoFree(iothreads[i]);
VIR_FREE(iothreads);
}
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index a388945..5da0b8f 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -4336,7 +4336,7 @@ qemuMonitorRTCResetReinjection(qemuMonitorPtr mon)
*/
int
qemuMonitorGetIOThreads(qemuMonitorPtr mon,
- qemuMonitorIOThreadsInfoPtr **iothreads)
+ qemuMonitorIOThreadInfoPtr **iothreads)
{
VIR_DEBUG("mon=%p iothreads=%p", mon, iothreads);
@@ -4356,7 +4356,7 @@ qemuMonitorGetIOThreads(qemuMonitorPtr mon,
return qemuMonitorJSONGetIOThreads(mon, iothreads);
}
-void qemuMonitorIOThreadsInfoFree(qemuMonitorIOThreadsInfoPtr iothread)
+void qemuMonitorIOThreadInfoFree(qemuMonitorIOThreadInfoPtr iothread)
{
if (!iothread)
return;
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index a663978..c7c3dab 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -872,17 +872,17 @@ int qemuMonitorGetGuestCPU(qemuMonitorPtr mon,
int qemuMonitorRTCResetReinjection(qemuMonitorPtr mon);
-typedef struct _qemuMonitorIOThreadsInfo qemuMonitorIOThreadsInfo;
-typedef qemuMonitorIOThreadsInfo *qemuMonitorIOThreadsInfoPtr;
+typedef struct _qemuMonitorIOThreadInfo qemuMonitorIOThreadInfo;
+typedef qemuMonitorIOThreadInfo *qemuMonitorIOThreadInfoPtr;
-struct _qemuMonitorIOThreadsInfo {
+struct _qemuMonitorIOThreadInfo {
char *name;
int thread_id;
};
int qemuMonitorGetIOThreads(qemuMonitorPtr mon,
- qemuMonitorIOThreadsInfoPtr **iothreads);
+ qemuMonitorIOThreadInfoPtr **iothreads);
-void qemuMonitorIOThreadsInfoFree(qemuMonitorIOThreadsInfoPtr iothread);
+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 67ce042..aa844ca 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -6411,13 +6411,13 @@ qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon)
*/
int
qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon,
- qemuMonitorIOThreadsInfoPtr **iothreads)
+ qemuMonitorIOThreadInfoPtr **iothreads)
{
int ret = -1;
virJSONValuePtr cmd;
virJSONValuePtr reply = NULL;
virJSONValuePtr data;
- qemuMonitorIOThreadsInfoPtr *infolist = NULL;
+ qemuMonitorIOThreadInfoPtr *infolist = NULL;
int n = 0;
size_t i;
@@ -6455,7 +6455,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon,
for (i = 0; i < n; i++) {
virJSONValuePtr child = virJSONValueArrayGet(data, i);
const char *tmp;
- qemuMonitorIOThreadsInfoPtr info;
+ qemuMonitorIOThreadInfoPtr info;
if (VIR_ALLOC(info) < 0)
goto cleanup;
@@ -6486,7 +6486,7 @@ qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon,
cleanup:
if (ret < 0 && infolist) {
for (i = 0; i < n; i++)
- qemuMonitorIOThreadsInfoFree(infolist[i]);
+ qemuMonitorIOThreadInfoFree(infolist[i]);
VIR_FREE(infolist);
}
virJSONValueFree(cmd);
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 143ed03..1be3b98 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -467,7 +467,7 @@ int qemuMonitorJSONGetGuestCPU(qemuMonitorPtr mon,
int qemuMonitorJSONRTCResetReinjection(qemuMonitorPtr mon);
int qemuMonitorJSONGetIOThreads(qemuMonitorPtr mon,
- qemuMonitorIOThreadsInfoPtr **iothreads)
+ qemuMonitorIOThreadInfoPtr **iothreads)
ATTRIBUTE_NONNULL(2);
int qemuMonitorJSONGetMemoryDeviceInfo(qemuMonitorPtr mon,
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 59eae1c..79f763e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2224,7 +2224,7 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver,
int asyncJob)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
- qemuMonitorIOThreadsInfoPtr *iothreads = NULL;
+ qemuMonitorIOThreadInfoPtr *iothreads = NULL;
int niothreads = 0;
int ret = -1;
size_t i;
@@ -2267,7 +2267,7 @@ qemuProcessDetectIOThreadPIDs(virQEMUDriverPtr driver,
cleanup:
if (iothreads) {
for (i = 0; i < niothreads; i++)
- qemuMonitorIOThreadsInfoFree(iothreads[i]);
+ qemuMonitorIOThreadInfoFree(iothreads[i]);
VIR_FREE(iothreads);
}
return ret;
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 1380df1..f09176a 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2241,7 +2241,7 @@ testQemuMonitorJSONGetIOThreads(const void *data)
{
virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt);
- qemuMonitorIOThreadsInfoPtr *info;
+ qemuMonitorIOThreadInfoPtr *info;
int ninfo = 0;
int ret = -1;
size_t i;
@@ -2300,7 +2300,7 @@ testQemuMonitorJSONGetIOThreads(const void *data)
cleanup:
qemuMonitorTestFree(test);
for (i = 0; i < ninfo; i++)
- qemuMonitorIOThreadsInfoFree(info[i]);
+ qemuMonitorIOThreadInfoFree(info[i]);
VIR_FREE(info);
return ret;
--
2.0.5