From patchwork Tue Jun 1 20:41:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 54307 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 93561B7D1C for ; Wed, 2 Jun 2010 06:47:36 +1000 (EST) Received: from localhost ([127.0.0.1]:46657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJYN3-000272-6G for incoming@patchwork.ozlabs.org; Tue, 01 Jun 2010 16:47:33 -0400 Received: from [140.186.70.92] (port=60720 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJYHs-0007UW-RO for qemu-devel@nongnu.org; Tue, 01 Jun 2010 16:42:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJYHq-0002er-Rd for qemu-devel@nongnu.org; Tue, 01 Jun 2010 16:42:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26614) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJYHq-0002ea-Iq for qemu-devel@nongnu.org; Tue, 01 Jun 2010 16:42:10 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o51Kg9Dg020910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 1 Jun 2010 16:42:09 -0400 Received: from localhost (vpn-11-63.rdu.redhat.com [10.11.11.63]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o51Kg8SO025754; Tue, 1 Jun 2010 16:42:09 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 1 Jun 2010 17:41:36 -0300 Message-Id: <1275424897-32253-9-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.18 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 8/9] QMP: Introduce qmp_check_input_obj() 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 This is similar to qmp_check_client_args(), but checks if the input object follows the specification (QMP/qmp-spec.txt section 2.3). As we're limited to three keys, the work here is quite simple: we iterate over the input object, each time checking if the given argument complies to the specification. Signed-off-by: Luiz Capitulino --- monitor.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 1875731..654b193 100644 --- a/monitor.c +++ b/monitor.c @@ -4271,6 +4271,45 @@ static int qmp_check_client_args(const mon_cmd_t *cmd, QDict *client_args) return res.result; } +/* + * Input object checking rules + * + * 1. "execute" key must exist (not checked here) + * 2. "execute" key must be a string + * 3. "arguments" key must be a dict + * 4. "id" key can be anything (ie. json-value) + * 5. Any argument not listed above is invalid + */ +static void qmp_check_input_obj(const char *input_obj_arg_name, + QObject *input_obj_arg, void *opaque) +{ + int *err = opaque; + + if (*err < 0) { + /* report only the first error */ + return; + } + + if (!strcmp(input_obj_arg_name, "execute")) { + if (qobject_type(input_obj_arg) != QTYPE_QSTRING) { + qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute", + "string"); + *err = -1; + } + } else if (!strcmp(input_obj_arg_name, "arguments")) { + if (qobject_type(input_obj_arg) != QTYPE_QDICT) { + qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "arguments", + "object"); + *err = -1; + } + } else if (!strcmp(input_obj_arg_name, "id")) { + /* nothing to do */ + } else { + qerror_report(QERR_QMP_INVALID_INPUT_OBJECT_MEMBER, input_obj_arg_name); + *err = -1; + } +} + static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) { int err; @@ -4295,6 +4334,12 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) input = qobject_to_qdict(obj); + err = 0; + qdict_iter(input, qmp_check_input_obj, &err); + if (err < 0) { + goto err_out; + } + mon->mc->id = qdict_get(input, "id"); qobject_incref(mon->mc->id);