[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 10/21] monitor: Propagate errors through qmp_chec
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 10/21] monitor: Propagate errors through qmp_check_input_obj() |
Date: |
Fri, 29 May 2015 11:56:49 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Luiz Capitulino <address@hidden>
---
monitor.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/monitor.c b/monitor.c
index 0afcf60..61ea346 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4929,14 +4929,14 @@ out:
* 5. If the "id" key exists, it can be anything (ie. json-value)
* 6. Any argument not listed above is considered invalid
*/
-static QDict *qmp_check_input_obj(QObject *input_obj)
+static QDict *qmp_check_input_obj(QObject *input_obj, Error **errp)
{
const QDictEntry *ent;
int has_exec_key = 0;
QDict *input_dict;
if (qobject_type(input_obj) != QTYPE_QDICT) {
- qerror_report(QERR_QMP_BAD_INPUT_OBJECT, "object");
+ error_set(errp, QERR_QMP_BAD_INPUT_OBJECT, "object");
return NULL;
}
@@ -4948,25 +4948,25 @@ static QDict *qmp_check_input_obj(QObject *input_obj)
if (!strcmp(arg_name, "execute")) {
if (qobject_type(arg_obj) != QTYPE_QSTRING) {
- qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute",
- "string");
+ error_set(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER,
+ "execute", "string");
return NULL;
}
has_exec_key = 1;
} else if (!strcmp(arg_name, "arguments")) {
if (qobject_type(arg_obj) != QTYPE_QDICT) {
- qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "arguments",
- "object");
+ error_set(errp, QERR_QMP_BAD_INPUT_OBJECT_MEMBER,
+ "arguments", "object");
return NULL;
}
} else {
- qerror_report(QERR_QMP_EXTRA_MEMBER, arg_name);
+ error_set(errp, QERR_QMP_EXTRA_MEMBER, arg_name);
return NULL;
}
}
if (!has_exec_key) {
- qerror_report(QERR_QMP_BAD_INPUT_OBJECT, "execute");
+ error_set(errp, QERR_QMP_BAD_INPUT_OBJECT, "execute");
return NULL;
}
@@ -4992,8 +4992,9 @@ static void handle_qmp_command(JSONMessageParser *parser,
QList *tokens)
goto err_out;
}
- input = qmp_check_input_obj(obj);
+ input = qmp_check_input_obj(obj, &local_err);
if (!input) {
+ qerror_report_err(local_err);
qobject_decref(obj);
goto err_out;
}
--
1.9.3
- [Qemu-devel] [PATCH v3 00/21] monitor: Wean core off QError, and other cleanups, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 02/21] monitor: Clean up after previous commit, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 03/21] monitor: Improve and document client_migrate_info protocol error, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 05/21] monitor: Use traditional command interface for HMP drive_del, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 13/21] monitor: Inline monitor_has_error() into its only caller, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 10/21] monitor: Propagate errors through qmp_check_input_obj(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 08/21] monitor: Drop unused "new" HMP command interface, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 12/21] monitor: Wean monitor_protocol_emitter() off mon->error, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 06/21] monitor: Use traditional command interface for HMP device_add, Markus Armbruster, 2015/05/29
- [Qemu-devel] [PATCH v3 11/21] monitor: Propagate errors through invalid_qmp_mode(), Markus Armbruster, 2015/05/29
- Re: [Qemu-devel] [PATCH v3 11/21] monitor: Propagate errors through invalid_qmp_mode(), Eric Blake, 2015/05/29
- [Qemu-devel] [PATCH v3 14/21] monitor: Limit QError use to command handlers, Markus Armbruster, 2015/05/29