| Message ID | 20200313170517.22480-2-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Minor error handling cleanups | expand |
On 200313 1805, Markus Armbruster wrote: > Signed-off-by: Markus Armbruster <armbru@redhat.com> > index 1a99277d60..aa9eee6ebf 100644 > --- a/tests/qtest/fuzz/qos_fuzz.c > +++ b/tests/qtest/fuzz/qos_fuzz.c > @@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void) > QList *lst; > Error *err = NULL; Can this err declaration be removed? Don't think it's used anywhere else. > > - qmp_marshal_query_machines(NULL, &response, &err); > - assert(!err); > + qmp_marshal_query_machines(NULL, &response, &error_abort); > lst = qobject_to(QList, response); > apply_to_qlist(lst, true); > > @@ -70,8 +69,7 @@ static void qos_set_machines_devices_available(void) > qdict_put_bool(args, "abstract", true); > qdict_put_obj(req, "arguments", (QObject *) args); > > - qmp_marshal_qom_list_types(args, &response, &err); > - assert(!err); > + qmp_marshal_qom_list_types(args, &response, &error_abort); > lst = qobject_to(QList, response); > apply_to_qlist(lst, false); > qobject_unref(response); > -- > 2.21.1 > Thanks! Acked-by: Alexander Bulekov <alxndr@bu.edu>
On 3/13/20 12:37 PM, Alexander Bulekov wrote: > On 200313 1805, Markus Armbruster wrote: >> Signed-off-by: Markus Armbruster <armbru@redhat.com> > > >> index 1a99277d60..aa9eee6ebf 100644 >> --- a/tests/qtest/fuzz/qos_fuzz.c >> +++ b/tests/qtest/fuzz/qos_fuzz.c >> @@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void) >> QList *lst; >> Error *err = NULL; > Can this err declaration be removed? Don't think it's used anywhere > else. Correct, it is not. With that additional line gone, Reviewed-by: Eric Blake <eblake@redhat.com>
Alexander Bulekov <alxndr@bu.edu> writes: > On 200313 1805, Markus Armbruster wrote: >> Signed-off-by: Markus Armbruster <armbru@redhat.com> > > >> index 1a99277d60..aa9eee6ebf 100644 >> --- a/tests/qtest/fuzz/qos_fuzz.c >> +++ b/tests/qtest/fuzz/qos_fuzz.c >> @@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void) >> QList *lst; >> Error *err = NULL; > Can this err declaration be removed? Don't think it's used anywhere > else. Will do. >> - qmp_marshal_query_machines(NULL, &response, &err); >> - assert(!err); >> + qmp_marshal_query_machines(NULL, &response, &error_abort); >> lst = qobject_to(QList, response); >> apply_to_qlist(lst, true); >> >> @@ -70,8 +69,7 @@ static void qos_set_machines_devices_available(void) >> qdict_put_bool(args, "abstract", true); >> qdict_put_obj(req, "arguments", (QObject *) args); >> >> - qmp_marshal_qom_list_types(args, &response, &err); >> - assert(!err); >> + qmp_marshal_qom_list_types(args, &response, &error_abort); >> lst = qobject_to(QList, response); >> apply_to_qlist(lst, false); >> qobject_unref(response); >> -- >> 2.21.1 >> > Thanks! > > Acked-by: Alexander Bulekov <alxndr@bu.edu> Thanks!
14.03.2020 7:58, Markus Armbruster wrote: > Alexander Bulekov <alxndr@bu.edu> writes: > >> On 200313 1805, Markus Armbruster wrote: >>> Signed-off-by: Markus Armbruster <armbru@redhat.com> >> >> >>> index 1a99277d60..aa9eee6ebf 100644 >>> --- a/tests/qtest/fuzz/qos_fuzz.c >>> +++ b/tests/qtest/fuzz/qos_fuzz.c >>> @@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void) >>> QList *lst; >>> Error *err = NULL; >> Can this err declaration be removed? Don't think it's used anywhere >> else. > > Will do. with this: Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > >>> - qmp_marshal_query_machines(NULL, &response, &err); >>> - assert(!err); >>> + qmp_marshal_query_machines(NULL, &response, &error_abort); >>> lst = qobject_to(QList, response); >>> apply_to_qlist(lst, true); >>> >>> @@ -70,8 +69,7 @@ static void qos_set_machines_devices_available(void) >>> qdict_put_bool(args, "abstract", true); >>> qdict_put_obj(req, "arguments", (QObject *) args); >>> >>> - qmp_marshal_qom_list_types(args, &response, &err); >>> - assert(!err); >>> + qmp_marshal_qom_list_types(args, &response, &error_abort); >>> lst = qobject_to(QList, response); >>> apply_to_qlist(lst, false); >>> qobject_unref(response); >>> -- >>> 2.21.1 >>> >> Thanks! >> >> Acked-by: Alexander Bulekov <alxndr@bu.edu> > > Thanks! >
diff --git a/block/monitor/block-hmp-cmds.c b/block/monitor/block-hmp-cmds.c index c3a6368dfc..4c8c375172 100644 --- a/block/monitor/block-hmp-cmds.c +++ b/block/monitor/block-hmp-cmds.c @@ -838,10 +838,8 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdict) void hmp_info_block_jobs(Monitor *mon, const QDict *qdict) { BlockJobInfoList *list; - Error *err = NULL; - list = qmp_query_block_jobs(&err); - assert(!err); + list = qmp_query_block_jobs(&error_abort); if (!list) { monitor_printf(mon, "No active jobs\n"); 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); } diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c index 1a99277d60..aa9eee6ebf 100644 --- a/tests/qtest/fuzz/qos_fuzz.c +++ b/tests/qtest/fuzz/qos_fuzz.c @@ -57,8 +57,7 @@ static void qos_set_machines_devices_available(void) QList *lst; Error *err = NULL; - qmp_marshal_query_machines(NULL, &response, &err); - assert(!err); + qmp_marshal_query_machines(NULL, &response, &error_abort); lst = qobject_to(QList, response); apply_to_qlist(lst, true); @@ -70,8 +69,7 @@ static void qos_set_machines_devices_available(void) qdict_put_bool(args, "abstract", true); qdict_put_obj(req, "arguments", (QObject *) args); - qmp_marshal_qom_list_types(args, &response, &err); - assert(!err); + qmp_marshal_qom_list_types(args, &response, &error_abort); lst = qobject_to(QList, response); apply_to_qlist(lst, false); qobject_unref(response);
Signed-off-by: Markus Armbruster <armbru@redhat.com> --- block/monitor/block-hmp-cmds.c | 4 +--- target/arm/monitor.c | 8 ++------ tests/qtest/fuzz/qos_fuzz.c | 6 ++---- 3 files changed, 5 insertions(+), 13 deletions(-)