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

Revert "qemu: monitor: Add the 'query-nodes' argument for query-blockstats" 

Turns out that 'query-nodes' is not what we want and the
'query-blockstats' command was in fact buggy. Revert the new field since
it's not needed.

This reverts commit 50edca1331.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-07-30 17:08:37 +02:00
parent 70644a8ba2
commit 8b5c8ecc0b
5 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_block.c
View File

@ -358,7 +358,7 @@ qemuBlockNodeNamesDetect(virQEMUDriverPtr driver,
return -1; return -1;
data = qemuMonitorQueryNamedBlockNodes(qemuDomainGetMonitor(vm)); data = qemuMonitorQueryNamedBlockNodes(qemuDomainGetMonitor(vm));
blockstats = qemuMonitorQueryBlockstats(qemuDomainGetMonitor(vm), false); blockstats = qemuMonitorQueryBlockstats(qemuDomainGetMonitor(vm));
if (qemuDomainObjExitMonitor(driver, vm) < 0 || !data || !blockstats) if (qemuDomainObjExitMonitor(driver, vm) < 0 || !data || !blockstats)
goto cleanup; goto cleanup;

8
src/qemu/qemu_monitor.c
View File

@ -2243,19 +2243,15 @@ qemuMonitorGetBlockInfo(qemuMonitorPtr mon)
/** /**
* qemuMonitorQueryBlockstats: * qemuMonitorQueryBlockstats:
* @mon: monitor object * @mon: monitor object
* @nodenames: include backing chain nodes with explicitly specified name
* *
* Returns data from a call to 'query-blockstats'. * Returns data from a call to 'query-blockstats'.
*/ */
virJSONValuePtr virJSONValuePtr
qemuMonitorQueryBlockstats(qemuMonitorPtr mon, qemuMonitorQueryBlockstats(qemuMonitorPtr mon)
bool nodenames)
{ {
QEMU_CHECK_MONITOR_NULL(mon); QEMU_CHECK_MONITOR_NULL(mon);
VIR_DEBUG("nodenames: %d", nodenames); return qemuMonitorJSONQueryBlockstats(mon);
return qemuMonitorJSONQueryBlockstats(mon, nodenames);
} }

3
src/qemu/qemu_monitor.h
View File

@ -563,8 +563,7 @@ int qemuMonitorSetMemoryStatsPeriod(qemuMonitorPtr mon,
int qemuMonitorBlockIOStatusToError(const char *status); int qemuMonitorBlockIOStatusToError(const char *status);
virHashTablePtr qemuMonitorGetBlockInfo(qemuMonitorPtr mon); virHashTablePtr qemuMonitorGetBlockInfo(qemuMonitorPtr mon);
virJSONValuePtr qemuMonitorQueryBlockstats(qemuMonitorPtr mon, virJSONValuePtr qemuMonitorQueryBlockstats(qemuMonitorPtr mon);
bool nodenames);
typedef struct _qemuBlockStats qemuBlockStats; typedef struct _qemuBlockStats qemuBlockStats;
typedef qemuBlockStats *qemuBlockStatsPtr; typedef qemuBlockStats *qemuBlockStatsPtr;

9
src/qemu/qemu_monitor_json.c
View File

@ -2362,16 +2362,13 @@ qemuMonitorJSONGetOneBlockStatsInfo(virJSONValuePtr dev,
virJSONValuePtr virJSONValuePtr
qemuMonitorJSONQueryBlockstats(qemuMonitorPtr mon, qemuMonitorJSONQueryBlockstats(qemuMonitorPtr mon)
bool nodenames)
{ {
virJSONValuePtr cmd; virJSONValuePtr cmd;
virJSONValuePtr reply = NULL; virJSONValuePtr reply = NULL;
virJSONValuePtr ret = NULL; virJSONValuePtr ret = NULL;
if (!(cmd = qemuMonitorJSONMakeCommand("query-blockstats", if (!(cmd = qemuMonitorJSONMakeCommand("query-blockstats", NULL)))
"B:query-nodes", nodenames,
NULL)))
return NULL; return NULL;
if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0) if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
@ -2400,7 +2397,7 @@ qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon,
size_t i; size_t i;
virJSONValuePtr devices; virJSONValuePtr devices;
if (!(devices = qemuMonitorJSONQueryBlockstats(mon, false))) if (!(devices = qemuMonitorJSONQueryBlockstats(mon)))
return -1; return -1;
for (i = 0; i < virJSONValueArraySize(devices); i++) { for (i = 0; i < virJSONValueArraySize(devices); i++) {

3
src/qemu/qemu_monitor_json.h
View File

@ -86,8 +86,7 @@ int qemuMonitorJSONSetMemoryStatsPeriod(qemuMonitorPtr mon,
int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon, int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
virHashTablePtr table); virHashTablePtr table);
virJSONValuePtr qemuMonitorJSONQueryBlockstats(qemuMonitorPtr mon, virJSONValuePtr qemuMonitorJSONQueryBlockstats(qemuMonitorPtr mon);
bool nodenames);
int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon, int qemuMonitorJSONGetAllBlockStatsInfo(qemuMonitorPtr mon,
virHashTablePtr hash, virHashTablePtr hash,
bool backingChain); bool backingChain);