[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/14] monitor: Clean up handle_hmp_command() a bit
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 13/14] monitor: Clean up handle_hmp_command() a bit |
Date: |
Fri, 17 Feb 2017 21:38:24 +0100 |
Leave checking qobject_type(req) to qmp_check_input_obj(). Rework
handling of json_parser_parse_err() failing without setting an error.
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index 493bed9..1e352a6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -3735,10 +3735,11 @@ static void handle_qmp_command(JSONMessageParser
*parser, GQueue *tokens)
Error *err = NULL;
req = json_parser_parse_err(tokens, NULL, &err);
- if (err || !req || qobject_type(req) != QTYPE_QDICT) {
- if (!err) {
- error_setg(&err, QERR_JSON_PARSING);
- }
+ if (!req && !err) {
+ /* json_parser_parse_err() sucks: can fail without setting @err */
+ error_setg(&err, QERR_JSON_PARSING);
+ }
+ if (err) {
goto err_out;
}
--
2.7.4
- [Qemu-devel] [PATCH 06/14] test-qmp-event: Simplify and tighten event_test_emit(), (continued)
- [Qemu-devel] [PATCH 06/14] test-qmp-event: Simplify and tighten event_test_emit(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 10/14] tests: Don't check qobject_type() before qobject_to_qint(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 07/14] Don't check qobject_type() before qobject_to_qdict(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 09/14] tests: Don't check qobject_type() before qobject_to_qstring(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 03/14] check-qdict: Tighten qdict_crumple_test_recursive() some, Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 13/14] monitor: Clean up handle_hmp_command() a bit,
Markus Armbruster <=
- [Qemu-devel] [PATCH 05/14] libqtest: Clean up qmp_response() a bit, Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 04/14] check-qjson: Simplify around compare_litqobj_to_qobj(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 08/14] tests: Don't check qobject_type() before qobject_to_qlist(), Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 14/14] block: Don't bother asserting type of output visitor's output, Markus Armbruster, 2017/02/17
- [Qemu-devel] [PATCH 12/14] tests: Don't check qobject_type() before qobject_to_qbool(), Markus Armbruster, 2017/02/17