diff options
Diffstat (limited to 'target/arm/monitor.c')
| -rw-r--r-- | target/arm/monitor.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/target/arm/monitor.c b/target/arm/monitor.c index ea6598c412..ba6e01abd0 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -174,19 +174,16 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, Error *err = NULL; visitor = qobject_input_visitor_new(model->props); - visit_start_struct(visitor, NULL, NULL, 0, &err); - if (err) { + if (!visit_start_struct(visitor, NULL, NULL, 0, errp)) { visit_free(visitor); object_unref(obj); - error_propagate(errp, err); return NULL; } i = 0; while ((name = cpu_model_advertised_features[i++]) != NULL) { if (qdict_get(qdict_in, name)) { - object_property_set(obj, visitor, name, &err); - if (err) { + if (!object_property_set(obj, name, visitor, &err)) { break; } } |