From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL v4 15/24] test-visitor-serialization: Pass &error_abort to qobject_from_json()
Date: Tue, 7 Mar 2017 16:20:36 +0100 [thread overview]
Message-ID: <1488900045-26344-16-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1488900045-26344-1-git-send-email-armbru@redhat.com>
qmp_deserialize() calls qobject_from_json() ignoring errors. It
passes the result to qobject_input_visitor_new(), which asserts it's
not null. Therefore, we can just as well pass &error_abort to
qobject_from_json().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <1488317230-26248-16-git-send-email-armbru@redhat.com>
---
tests/test-visitor-serialization.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
index 37dff41..4d47cee 100644
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -1037,7 +1037,7 @@ static void qmp_deserialize(void **native_out, void *datap,
visit_complete(d->qov, &d->obj);
obj_orig = d->obj;
output_json = qobject_to_json(obj_orig);
- obj = qobject_from_json(qstring_get_str(output_json), NULL);
+ obj = qobject_from_json(qstring_get_str(output_json), &error_abort);
QDECREF(output_json);
d->qiv = qobject_input_visitor_new(obj);
--
2.7.4
next prev parent reply other threads:[~2017-03-07 15:20 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-07 15:20 [Qemu-devel] [PULL v4 00/24] block: Command line option -blockdev Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 01/24] test-qemu-opts: Cover qemu_opts_parse() of "no" Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 02/24] tests: Fix gcov-files-test-qemu-opts-y, gcov-files-test-logging-y Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 03/24] keyval: New keyval_parse() Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 04/24] qapi: qobject input visitor variant for use with keyval_parse() Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 05/24] test-keyval: Cover use with qobject input visitor Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 06/24] qapi: Factor out common part of qobject input visitor creation Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 07/24] qapi: Factor out common qobject_input_get_keyval() Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 08/24] qobject: Propagate parse errors through qobject_from_jsonv() Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 09/24] libqtest: Fix qmp() & friends to abort on JSON parse errors Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 10/24] qjson: Abort earlier on qobject_from_jsonf() misuse Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 11/24] test-qobject-input-visitor: Abort earlier on bad test input Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 12/24] qobject: Propagate parse errors through qobject_from_json() Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 13/24] block: More detailed syntax error reporting for JSON filenames Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 14/24] check-qjson: Test errors from qobject_from_json() Markus Armbruster
2017-03-07 15:20 ` Markus Armbruster [this message]
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 16/24] monitor: Assert qmp_schema_json[] is sane Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 17/24] test-qapi-util: New, covering qapi/qapi-util.c Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 18/24] qapi: New parse_qapi_name() Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 19/24] keyval: Restrict key components to valid QAPI names Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 20/24] qapi: New qobject_input_visitor_new_str() for convenience Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 21/24] block: Initial implementation of -blockdev Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 22/24] qapi: Improve how keyval input visitor reports unexpected dicts Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 23/24] docs/qapi-code-gen.txt: Clarify naming rules Markus Armbruster
2017-03-07 15:20 ` [Qemu-devel] [PULL v4 24/24] keyval: Support lists Markus Armbruster
2017-03-07 15:39 ` [Qemu-devel] [PULL v4 00/24] block: Command line option -blockdev no-reply
2017-03-08 9:47 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488900045-26344-16-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).