diff options
| author | Markus Armbruster <armbru@redhat.com> | 2020-03-13 18:05:15 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-03-17 16:05:40 +0100 |
| commit | 20ac582d0cdf78348650318eeabba5bcd486613f (patch) | |
| tree | 05acf1d77c7c41493772ffd738e781cb3a3d8ab8 /target/arm/monitor.c | |
| parent | 40c67636f67c2a89745f2e698522fe917326a952 (diff) | |
Use &error_abort instead of separate assert()
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200313170517.22480-2-armbru@redhat.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
[Unused Error *variable deleted]
Diffstat (limited to 'target/arm/monitor.c')
| -rw-r--r-- | target/arm/monitor.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/target/arm/monitor.c b/target/arm/monitor.c index c2dc7908de..ea6598c412 100644 --- a/target/arm/monitor.c +++ b/target/arm/monitor.c @@ -206,9 +206,7 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, return NULL; } } else { - Error *err = NULL; - arm_cpu_finalize_features(ARM_CPU(obj), &err); - assert(err == NULL); + arm_cpu_finalize_features(ARM_CPU(obj), &error_abort); } expansion_info = g_new0(CpuModelExpansionInfo, 1); @@ -221,12 +219,10 @@ CpuModelExpansionInfo *qmp_query_cpu_model_expansion(CpuModelExpansionType type, while ((name = cpu_model_advertised_features[i++]) != NULL) { ObjectProperty *prop = object_property_find(obj, name, NULL); if (prop) { - Error *err = NULL; QObject *value; assert(prop->get); - value = object_property_get_qobject(obj, name, &err); - assert(!err); + value = object_property_get_qobject(obj, name, &error_abort); qdict_put_obj(qdict_out, name, value); } |