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

qemu_monitor_json: Replace simplify fetching Array from JSON object

Browse Source 
Replace instances of virJSONValueObjectGet + virJSONValueIsArray by
virJSONValueObjectGetArray.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Peter Krempa 2022-12-06 15:29:28 +01:00
parent d7c1be7975
commit 1d05a04821
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/qemu/qemu_monitor_json.c
View File

@ -3634,11 +3634,9 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValue *msg,
"in query-rx-filter response"));
return -1;
}
if ((!(table = virJSONValueObjectGet(entry, "unicast-table"))) ||
(!virJSONValueIsArray(table))) {
if ((!(table = virJSONValueObjectGetArray(entry, "unicast-table")))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing or invalid 'unicast-table' array "
"in query-rx-filter response"));
_("Missing or invalid 'unicast-table' array in query-rx-filter response"));
return -1;
}
nTable = virJSONValueArraySize(table);
@ -3675,11 +3673,9 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValue *msg,
"in query-rx-filter response"));
return -1;
}
if ((!(table = virJSONValueObjectGet(entry, "multicast-table"))) ||
(!virJSONValueIsArray(table))) {
if ((!(table = virJSONValueObjectGetArray(entry, "multicast-table")))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing or invalid 'multicast-table' array "
"in query-rx-filter response"));
_("Missing or invalid 'multicast-table' array in query-rx-filter response"));
return -1;
}
nTable = virJSONValueArraySize(table);
@ -3709,11 +3705,9 @@ qemuMonitorJSONQueryRxFilterParse(virJSONValue *msg,
"in query-rx-filter response"));
return -1;
}
if ((!(table = virJSONValueObjectGet(entry, "vlan-table"))) ||
(!virJSONValueIsArray(table))) {
if ((!(table = virJSONValueObjectGetArray(entry, "vlan-table")))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Missing or invalid 'vlan-table' array "
"in query-rx-filter response"));
_("Missing or invalid 'vlan-table' array in query-rx-filter response"));
return -1;
}
nTable = virJSONValueArraySize(table);
@ -8722,9 +8716,7 @@ qemuMonitorJSONExtractQueryStatsSchema(virJSONValue *json)
if (!virJSONValueIsObject(obj))
continue;
stats = virJSONValueObjectGetArray(obj, "stats");
if (!virJSONValueIsArray(stats))
if (!(stats = virJSONValueObjectGetArray(obj, "stats")))
continue;
target_str = virJSONValueObjectGetString(obj, "target");