From patchwork Tue Jun 1 20:41:37 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 54310 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 151EDB7D20 for ; Wed, 2 Jun 2010 06:51:41 +1000 (EST) Received: from localhost ([127.0.0.1]:46979 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJYR0-00052e-8p for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 16:51:38 -0400 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 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 o51KgBUk010956 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 1 Jun 2010 16:42:12 -0400 Received: from localhost (vpn-11-63.rdu.redhat.com [10.11.11.63]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o51KgAJW026978; Tue, 1 Jun 2010 16:42:11 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org 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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: jan.kiszka@siemens.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 9/9] QMP: Drop old input object checking code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);