External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemuMonitorJSONQueryStats: Simplify logic to construct 'provider_list'

Browse Source 
Simplify construction of a single provider by using
virJSONValueObjectAdd and restructuring the code.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2022-11-09 16:59:25 +01:00
parent 72e3100e82
commit d7c1be7975
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qemu/qemu_monitor_json.c
View File

@ -8828,36 +8828,32 @@ qemuMonitorJSONQueryStats(qemuMonitor *mon,
g_autoptr(virJSONValue) reply = NULL; g_autoptr(virJSONValue) reply = NULL;
g_autoptr(virJSONValue) vcpu_list = NULL; g_autoptr(virJSONValue) vcpu_list = NULL;
g_autoptr(virJSONValue) provider_list = NULL; g_autoptr(virJSONValue) provider_list = NULL;
size_t i; size_t i;
if (providers) { if (providers) {
provider_list = virJSONValueNewArray(); provider_list = virJSONValueNewArray();
for (i = 0; i < providers->len; i++) { for (i = 0; i < providers->len; i++) {
g_autoptr(virJSONValue) provider_obj = virJSONValueNewObject();
qemuMonitorQueryStatsProvider *provider = providers->pdata[i]; qemuMonitorQueryStatsProvider *provider = providers->pdata[i];
const char *type_str = qemuMonitorQueryStatsProviderTypeToString(provider->type); g_autoptr(virJSONValue) provider_obj = NULL;
virBitmap *names = provider->names; g_autoptr(virJSONValue) provider_names = NULL;
ssize_t curBit = -1;
if (virJSONValueObjectAppendString(provider_obj, "provider", type_str) < 0) while ((curBit = virBitmapNextSetBit(provider->names, curBit)) != -1) {
return NULL; if (!provider_names)
provider_names = virJSONValueNewArray();
if (!virBitmapIsAllClear(names)) { if (virJSONValueArrayAppendString(provider_names,
g_autoptr(virJSONValue) provider_names = virJSONValueNewArray(); qemuMonitorQueryStatsNameTypeToString(curBit)) < 0)
ssize_t curBit = -1;
while ((curBit = virBitmapNextSetBit(names, curBit)) != -1) {
const char *name = qemuMonitorQueryStatsNameTypeToString(curBit);
if (virJSONValueArrayAppendString(provider_names, name) < 0)
return NULL;
}
if (virJSONValueObjectAppend(provider_obj, "names", &provider_names) < 0)
return NULL; return NULL;
} }
if (virJSONValueObjectAdd(&provider_obj,
"s:provider", qemuMonitorQueryStatsProviderTypeToString(provider->type),
"A:names", &provider_names,
NULL) < 0)
return NULL;
if (virJSONValueArrayAppend(provider_list, &provider_obj) < 0) if (virJSONValueArrayAppend(provider_list, &provider_obj) < 0)
return NULL; return NULL;
} }