openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: monitor: Rename qemuMonitor(JSON|Text)GetCPUInfo 

Use a name that contains the command used to get the information.
This commit is contained in:
Peter Krempa 2016-07-08 15:36:27 +02:00
parent 8f56b5baaf
commit 5965fa759c
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_monitor.c
View File

@ -1672,9 +1672,9 @@ qemuMonitorGetCPUInfo(qemuMonitorPtr mon,
QEMU_CHECK_MONITOR(mon); QEMU_CHECK_MONITOR(mon);
if (mon->json) if (mon->json)
return qemuMonitorJSONGetCPUInfo(mon, pids); return qemuMonitorJSONQueryCPUs(mon, pids);
else else
return qemuMonitorTextGetCPUInfo(mon, pids); return qemuMonitorTextQueryCPUs(mon, pids);
} }

5
src/qemu/qemu_monitor_json.c
View File

@ -1376,8 +1376,9 @@ qemuMonitorJSONExtractCPUInfo(virJSONValuePtr reply,
} }
int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon, int
int **pids) qemuMonitorJSONQueryCPUs(qemuMonitorPtr mon,
int **pids)
{ {
int ret = -1; int ret = -1;
virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-cpus", virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("query-cpus",

4
src/qemu/qemu_monitor_json.h
View File

@ -58,8 +58,8 @@ int qemuMonitorJSONGetStatus(qemuMonitorPtr mon,
int qemuMonitorJSONSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorJSONSystemPowerdown(qemuMonitorPtr mon);
int qemuMonitorJSONSystemReset(qemuMonitorPtr mon); int qemuMonitorJSONSystemReset(qemuMonitorPtr mon);
int qemuMonitorJSONGetCPUInfo(qemuMonitorPtr mon, int qemuMonitorJSONQueryCPUs(qemuMonitorPtr mon,
int **pids); int **pids);
int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon, int qemuMonitorJSONGetVirtType(qemuMonitorPtr mon,
virDomainVirtType *virtType); virDomainVirtType *virtType);
int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, int qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon,

5
src/qemu/qemu_monitor_text.c
View File

@ -500,8 +500,9 @@ int qemuMonitorTextSystemReset(qemuMonitorPtr mon)
} }
int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, int
int **pids) qemuMonitorTextQueryCPUs(qemuMonitorPtr mon,
int **pids)
{ {
char *qemucpus = NULL; char *qemucpus = NULL;
char *line; char *line;

4
src/qemu/qemu_monitor_text.h
View File

@ -49,8 +49,8 @@ int qemuMonitorTextGetStatus(qemuMonitorPtr mon,
int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon); int qemuMonitorTextSystemPowerdown(qemuMonitorPtr mon);
int qemuMonitorTextSystemReset(qemuMonitorPtr mon); int qemuMonitorTextSystemReset(qemuMonitorPtr mon);
int qemuMonitorTextGetCPUInfo(qemuMonitorPtr mon, int qemuMonitorTextQueryCPUs(qemuMonitorPtr mon,
int **pids); int **pids);
int qemuMonitorTextGetVirtType(qemuMonitorPtr mon, int qemuMonitorTextGetVirtType(qemuMonitorPtr mon,
virDomainVirtType *virtType); virDomainVirtType *virtType);
int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon, int qemuMonitorTextGetBalloonInfo(qemuMonitorPtr mon,

6
tests/qemumonitorjsontest.c
View File

@ -1203,7 +1203,7 @@ GEN_TEST_FUNC(qemuMonitorJSONDetachCharDev, "serial1")
static int static int
testQemuMonitorJSONqemuMonitorJSONGetCPUInfo(const void *data) testQemuMonitorJSONqemuMonitorJSONQueryCPUs(const void *data)
{ {
virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt);
@ -1252,7 +1252,7 @@ testQemuMonitorJSONqemuMonitorJSONGetCPUInfo(const void *data)
"}") < 0) "}") < 0)
goto cleanup; goto cleanup;
ncpupids = qemuMonitorJSONGetCPUInfo(qemuMonitorTestGetMonitor(test), &cpupids); ncpupids = qemuMonitorJSONQueryCPUs(qemuMonitorTestGetMonitor(test), &cpupids);
if (ncpupids != 4) { if (ncpupids != 4) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
@ -2420,7 +2420,7 @@ mymain(void)
DO_TEST(qemuMonitorJSONSetBlockIoThrottle); DO_TEST(qemuMonitorJSONSetBlockIoThrottle);
DO_TEST(qemuMonitorJSONGetTargetArch); DO_TEST(qemuMonitorJSONGetTargetArch);
DO_TEST(qemuMonitorJSONGetMigrationCapability); DO_TEST(qemuMonitorJSONGetMigrationCapability);
DO_TEST(qemuMonitorJSONGetCPUInfo); DO_TEST(qemuMonitorJSONQueryCPUs);
DO_TEST(qemuMonitorJSONGetVirtType); DO_TEST(qemuMonitorJSONGetVirtType);
DO_TEST(qemuMonitorJSONSendKey); DO_TEST(qemuMonitorJSONSendKey);
DO_TEST(qemuMonitorJSONGetDumpGuestMemoryCapability); DO_TEST(qemuMonitorJSONGetDumpGuestMemoryCapability);