From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33670) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciqDv-00058G-QV for qemu-devel@nongnu.org; Tue, 28 Feb 2017 17:26:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciqDu-0000bE-3n for qemu-devel@nongnu.org; Tue, 28 Feb 2017 17:26:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:54590) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ciqDt-0000Zi-L5 for qemu-devel@nongnu.org; Tue, 28 Feb 2017 17:26:21 -0500 Received: from smtp.corp.redhat.com (int-mx16.intmail.prod.int.phx2.redhat.com [10.5.11.28]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D0FFC7FB67 for ; Tue, 28 Feb 2017 22:26:21 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9BA511DCC0 for ; Tue, 28 Feb 2017 22:26:21 +0000 (UTC) From: Markus Armbruster Date: Tue, 28 Feb 2017 23:26:07 +0100 Message-Id: <1488320775-9849-17-git-send-email-armbru@redhat.com> In-Reply-To: <1488320775-9849-1-git-send-email-armbru@redhat.com> References: <1488320775-9849-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 16/24] monitor: Assert qmp_schema_json[] is sane List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Reviewed-by: Kevin Wolf 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