From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=55677 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OR7Te-0004dS-Lu for qemu-devel@nongnu.org; Tue, 22 Jun 2010 13:41:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OR7TX-0000fg-S5 for qemu-devel@nongnu.org; Tue, 22 Jun 2010 13:41:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35433) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OR7TX-0000fY-Kz for qemu-devel@nongnu.org; Tue, 22 Jun 2010 13:41:31 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5MHfUqU017791 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 22 Jun 2010 13:41:30 -0400 From: Luiz Capitulino Date: Tue, 22 Jun 2010 14:40:51 -0300 Message-Id: <1277228451-7741-14-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1277228451-7741-1-git-send-email-lcapitulino@redhat.com> References: <1277228451-7741-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 13/13] QMP: Drop old input object checking List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com Previous commit added qmp_check_input_obj(), it does all the checking we need. Signed-off-by: Luiz Capitulino --- monitor.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index a24a152..c558cc7 100644 --- a/monitor.c +++ b/monitor.c @@ -4239,9 +4239,6 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) if (!obj) { qerror_report(QERR_QMP_BAD_INPUT_OBJECT, "execute"); goto err_input; - } else if (qobject_type(obj) != QTYPE_QSTRING) { - qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute", "string"); - goto err_input; } cmd_name = qstring_get_str(qobject_to_qstring(obj)); @@ -4273,9 +4270,6 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) obj = qdict_get(input, "arguments"); if (!obj) { args = qdict_new(); - } else if (qobject_type(obj) != QTYPE_QDICT) { - qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "arguments", "object"); - goto err_input; } else { args = qobject_to_qdict(obj); QINCREF(args); -- 1.7.1.359.gd0b8d