From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45234 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1ORSp8-0000gw-Mm for qemu-devel@nongnu.org; Wed, 23 Jun 2010 12:29:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1ORSp4-0008Oe-6i for qemu-devel@nongnu.org; Wed, 23 Jun 2010 12:29:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53034) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1ORSp3-0008OV-TL for qemu-devel@nongnu.org; Wed, 23 Jun 2010 12:29:10 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5NGT9AY025007 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 23 Jun 2010 12:29:09 -0400 Date: Wed, 23 Jun 2010 13:29:04 -0300 From: Luiz Capitulino Subject: Re: [Qemu-devel] [PATCH 12/13] QMP: Introduce qmp_check_input_obj() Message-ID: <20100623132904.79d8e424@redhat.com> In-Reply-To: References: <1277228451-7741-1-git-send-email-lcapitulino@redhat.com> <1277228451-7741-13-git-send-email-lcapitulino@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org On Wed, 23 Jun 2010 17:23:54 +0200 Markus Armbruster wrote: > Luiz Capitulino writes: > > > This is similar to qmp_check_client_args(), but it 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, checking each time if the > > current 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 2a29095..a24a152 100644 > > --- a/monitor.c > > +++ b/monitor.c > > @@ -4163,6 +4163,46 @@ out: > > return err; > > } > > > > +/* > > + * Input object checking rules > > + * > > + * 1. "execute" key must exist (not checked here) > > Is it checked elsewhere? If yes, make it (checked elsewhere already) Yes, will do. > > + * 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 considered unexpected > > + */ > > +static int qmp_check_input_obj(const QDict *input_obj) > > +{ > > + const QDictEntry *ent; > > + > > + for (ent = qdict_first(input_obj); ent; ent = qdict_next(input_obj, ent)) { > > + const char *arg_name = qdict_entry_key(ent); > > + const QObject *arg_obj = qdict_entry_value(ent); > > + > > + if (!strcmp(arg_name, "execute")) { > > + if (qobject_type(arg_obj) != QTYPE_QSTRING) { > > + qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "execute", > > + "string"); > > + return -1; > > + } > > + } else if (!strcmp(arg_name, "arguments")) { > > + if (qobject_type(arg_obj) != QTYPE_QDICT) { > > + qerror_report(QERR_QMP_BAD_INPUT_OBJECT_MEMBER, "arguments", > > + "object"); > > + return -1; > > + } > > + } else if (!strcmp(arg_name, "id")) { > > + /* FIXME: check duplicated IDs for async commands */ > > + } else { > > + qerror_report(QERR_QMP_UNEXPECTED_INPUT_OBJECT_MEMBER, arg_name); > > Identifier's a bit on the long side, isn't it? Yes, suggestions? > > > + return -1; > > + } > > + } > > + > > + return 0; > > +} > > + > > static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) > > { > > int err; > > @@ -4187,6 +4227,11 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) > > > > input = qobject_to_qdict(obj); > > > > + err = qmp_check_input_obj(input); > > + if (err < 0) { > > + goto err_input; > > + } > > + > > mon->mc->id = qdict_get(input, "id"); > > qobject_incref(mon->mc->id); >