From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:36736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWw2p-0007Jo-9T for qemu-devel@nongnu.org; Wed, 15 Jun 2011 15:46:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QWw2n-0006tR-4s for qemu-devel@nongnu.org; Wed, 15 Jun 2011 15:46:30 -0400 Received: from e2.ny.us.ibm.com ([32.97.182.142]:41937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QWw2m-0006tF-SN for qemu-devel@nongnu.org; Wed, 15 Jun 2011 15:46:28 -0400 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e2.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p5FJPs78022867 for ; Wed, 15 Jun 2011 15:25:54 -0400 Received: from d03av06.boulder.ibm.com (d03av06.boulder.ibm.com [9.17.195.245]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p5FJjhcH215194 for ; Wed, 15 Jun 2011 15:45:50 -0400 Received: from d03av06.boulder.ibm.com (loopback [127.0.0.1]) by d03av06.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p5FJonUD031708 for ; Wed, 15 Jun 2011 13:50:49 -0600 Message-ID: <4DF90BDA.2050201@us.ibm.com> Date: Wed, 15 Jun 2011 14:45:30 -0500 From: Anthony Liguori MIME-Version: 1.0 References: <1308018686-8235-1-git-send-email-mdroth@linux.vnet.ibm.com> <1308018686-8235-10-git-send-email-mdroth@linux.vnet.ibm.com> <20110615163314.2db81c17@doriath> In-Reply-To: <20110615163314.2db81c17@doriath> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 09/21] qapi: add QMP dispatch functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Luiz Capitulino Cc: Jes.Sorensen@redhat.com, agl@linux.vnet.ibm.com, Michael Roth , qemu-devel@nongnu.org On 06/15/2011 02:33 PM, Luiz Capitulino wrote: > On Mon, 13 Jun 2011 21:31:14 -0500 > Michael Roth wrote: > > >> +{ >> + const char *command; >> + QDict *args, *dict; >> + QmpCommand *cmd; >> + QObject *ret = NULL; >> + >> + if (qobject_type(request) != QTYPE_QDICT) { >> + error_set(errp, QERR_JSON_PARSE_ERROR, "request is not a dictionary"); >> + goto out; >> + } >> + >> + dict = qobject_to_qdict(request); >> + if (!qdict_haskey(dict, "execute")) { >> + error_set(errp, QERR_JSON_PARSE_ERROR, "no execute key"); >> + goto out; >> + } >> + >> + command = qdict_get_str(dict, "execute"); >> + cmd = qmp_find_command(command); >> + if (cmd == NULL) { >> + error_set(errp, QERR_COMMAND_NOT_FOUND, command); >> + goto out; >> + } >> + >> + if (!qdict_haskey(dict, "arguments")) { >> + args = qdict_new(); >> + } else { >> + args = qdict_get_qdict(dict, "arguments"); >> + QINCREF(args); >> + } > > This function doesn't seem to handle extra keys in the command dict, like: > > { "execute": "query-block", "foo": "bar" } > > You probably want to use qmp_check_input_obj() here. That's a feature, no? "Be liberal in what you accept, conservative in what you send." > >> + >> + switch (cmd->type) { >> + case QCT_NORMAL: >> + cmd->fn(args,&ret, errp); >> + if (!error_is_set(errp)&& ret == NULL) { >> + ret = QOBJECT(qdict_new()); >> + } >> + break; >> + } >> + >> + QDECREF(args); >> + >> +out: >> + >> + return ret; >> +} >> + >> +QObject *qmp_dispatch(QObject *request) >> +{ >> + Error *err = NULL; >> + QObject *ret; >> + QDict *rsp; >> + >> + ret = qmp_dispatch_err(request,&err); >> + >> + rsp = qdict_new(); >> + if (err) { >> + qdict_put_obj(rsp, "error", error_get_qobject(err)); >> + error_free(err); >> + } else if (ret) { >> + qdict_put_obj(rsp, "return", ret); >> + } else { >> + QDECREF(rsp); >> + return NULL; > > When does the 'else' condition happens? Signals which aren't in this patch series. Regards, Anthony Liguori > >> + } >> + >> + return QOBJECT(rsp); >> +} >