From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=60732 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJYHu-0007VJ-2W for qemu-devel@nongnu.org; Tue, 01 Jun 2010 16:42:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJYHs-0002fF-QW for qemu-devel@nongnu.org; Tue, 01 Jun 2010 16:42:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51490) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJYHs-0002f8-IJ for qemu-devel@nongnu.org; Tue, 01 Jun 2010 16:42:12 -0400 From: Luiz Capitulino Date: Tue, 1 Jun 2010 17:41:37 -0300 Message-Id: <1275424897-32253-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1275424897-32253-1-git-send-email-lcapitulino@redhat.com> References: <1275424897-32253-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 9/9] QMP: Drop old input object checking code List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, armbru@redhat.com Previous commit added qmp_check_input_obj(), it does this checking for us. Signed-off-by: Luiz Capitulino --- monitor.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 654b193..f849456 100644 --- a/monitor.c +++ b/monitor.c @@ -4347,9 +4347,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)); @@ -4381,9 +4378,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.231.gd0b16