motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target: Improve error reporting for CpuModelInfo member @props

Browse source 
query-cpu-model-comparison, query-cpu-model-baseline, and
query-cpu-model-expansion take CpuModelInfo arguments.  Errors in
@props members of these arguments are reported for 'props', without
further context.  For instance, s390x rejects

    {"execute": "query-cpu-model-comparison", "arguments": {"modela": {"name": "z13", "props": {}}, "modelb": {"name": "z14", "props": []}}}

with

    {"error": {"class": "GenericError", "desc": "Invalid parameter type for 'props', expected: object"}}

This is unusual; the common QAPI unmarshaling machinery would complain
about 'modelb.props'.  Our hand-written code to visit the @props
member neglects to provide the context.

Tweak it so it provides it.  The command above now fails with

    {"error": {"class": "GenericError", "desc": "Invalid parameter type for 'modelb.props', expected: dict"}}

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240305145919.2186971-4-armbru@redhat.com>
Acked-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
This commit is contained in:
Markus Armbruster 2024-03-05 15:59:17 +01:00
parent 68192a5ffd
commit 8934643a0e
5 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

6
target/riscv/riscv-qmp-cmds.c
View file

@ -128,6 +128,7 @@ static void riscv_obj_add_profiles_qdict(Object *obj, QDict *qdict_out)
}
static void riscv_cpuobj_validate_qdict_in(Object *obj, QObject *props,
const char *props_arg_name,
Error **errp)
{
const QDict *qdict_in;
@ -136,7 +137,7 @@ static void riscv_cpuobj_validate_qdict_in(Object *obj, QObject *props,
Error *local_err = NULL;
visitor = qobject_input_visitor_new(props);
if (!visit_start_struct(visitor, "props", NULL, 0, &local_err)) {
if (!visit_start_struct(visitor, props_arg_name, NULL, 0, &local_err)) {
goto err;
}
@ -197,7 +198,8 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type,
}
if (model->props) {
riscv_cpuobj_validate_qdict_in(obj, model->props, &local_err);
riscv_cpuobj_validate_qdict_in(obj, model->props, "model.props",
&local_err);
if (local_err) {
error_propagate(errp, local_err);
object_unref(obj);