All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 16/24] monitor: Assert qmp_schema_json[] is sane
Date: Tue, 28 Feb 2017 23:26:07 +0100	[thread overview]
Message-ID: <1488320775-9849-17-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1488320775-9849-1-git-send-email-armbru@redhat.com>

qmp_query_qmp_schema() parses qmp_schema_json[] with
qobject_from_json().  This must not fail, so pass &error_abort.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <1488317230-26248-17-git-send-email-armbru@redhat.com>
---
 monitor.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monitor.c b/monitor.c
index 858bcda..13f6133 100644
--- a/monitor.c
+++ b/monitor.c
@@ -950,7 +950,7 @@ EventInfoList *qmp_query_events(Error **errp)
 static void qmp_query_qmp_schema(QDict *qdict, QObject **ret_data,
                                  Error **errp)
 {
-    *ret_data = qobject_from_json(qmp_schema_json, NULL);
+    *ret_data = qobject_from_json(qmp_schema_json, &error_abort);
 }
 
 /*
-- 
2.7.4

  parent reply	other threads:[~2017-02-28 22:26 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-28 22:25 [Qemu-devel] [PULL 00/24] block: Command line option -blockdev Markus Armbruster
2017-02-28 22:25 ` [Qemu-devel] [PULL 01/24] test-qemu-opts: Cover qemu_opts_parse() of "no" Markus Armbruster
2017-02-28 22:25 ` [Qemu-devel] [PULL 02/24] tests: Fix gcov-files-test-qemu-opts-y, gcov-files-test-logging-y Markus Armbruster
2017-02-28 22:25 ` [Qemu-devel] [PULL 03/24] keyval: New keyval_parse() Markus Armbruster
2017-02-28 22:25 ` [Qemu-devel] [PULL 04/24] qapi: qobject input visitor variant for use with keyval_parse() Markus Armbruster
2017-02-28 22:25 ` [Qemu-devel] [PULL 05/24] test-keyval: Cover use with qobject input visitor Markus Armbruster
2017-02-28 22:25 ` [Qemu-devel] [PULL 06/24] qapi: Factor out common part of qobject input visitor creation Markus Armbruster
2017-02-28 22:25 ` [Qemu-devel] [PULL 07/24] qapi: Factor out common qobject_input_get_keyval() Markus Armbruster
2017-02-28 22:25 ` [Qemu-devel] [PULL 08/24] qobject: Propagate parse errors through qobject_from_jsonv() Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 09/24] libqtest: Fix qmp() & friends to abort on JSON parse errors Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 10/24] qjson: Abort earlier on qobject_from_jsonf() misuse Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 11/24] test-qobject-input-visitor: Abort earlier on bad test input Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 12/24] qobject: Propagate parse errors through qobject_from_json() Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 13/24] block: More detailed syntax error reporting for JSON filenames Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 14/24] check-qjson: Test errors from qobject_from_json() Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 15/24] test-visitor-serialization: Pass &error_abort to qobject_from_json() Markus Armbruster
2017-02-28 22:26 ` Markus Armbruster [this message]
2017-02-28 22:26 ` [Qemu-devel] [PULL 17/24] test-qapi-util: New, covering qapi/qapi-util.c Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 18/24] qapi: New parse_qapi_name() Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 19/24] keyval: Restrict key components to valid QAPI names Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 20/24] qapi: New qobject_input_visitor_new_str() for convenience Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 21/24] block: Initial implementation of -blockdev Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 22/24] qapi: Improve how keyval input visitor reports unexpected dicts Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 23/24] docs/qapi-code-gen.txt: Clarify naming rules Markus Armbruster
2017-02-28 22:26 ` [Qemu-devel] [PULL 24/24] keyval: Support lists Markus Armbruster
2017-03-02 15:25 ` [Qemu-devel] [PULL 00/24] block: Command line option -blockdev Peter Maydell
2017-03-03 16:31   ` Peter Maydell
2017-03-03 16:36     ` Peter Maydell
2017-03-03 16:40       ` Peter Maydell
2017-03-03 16:58     ` Markus Armbruster

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=1488320775-9849-17-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.