From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=39728 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwKxn-0000jt-R0 for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OwKxb-0001SF-Jg for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9259) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OwKxb-0001S6-BN for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:35 -0400 From: Luiz Capitulino Date: Thu, 16 Sep 2010 17:20:58 -0300 Message-Id: <1284668464-15981-13-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> References: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 12/18] QMP: Small cleanup in handle_qmp_command() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, armbru@redhat.com QMP has its own dispatch tables, we can now drop the following checks: o 'info' command: this command doesn't exist in QMP's dispatch table, the right thing will happen when it's issued by a client (ie. command not found error) o monitor_handler_ported(): all QMP handlers are 'ported', no need to check for that o monitor_cmd_user_only(): no HMP handler will exist in QMP's dispatch tables, that's why we have split them after all :-) Signed-off-by: Luiz Capitulino --- monitor.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/monitor.c b/monitor.c index 6998b3f..8cf50ce 100644 --- a/monitor.c +++ b/monitor.c @@ -4469,19 +4469,13 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens) goto err_out; } - /* - * XXX: We need this special case until QMP has its own dispatch table - */ - if (compare_cmd(cmd_name, "info")) { - qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); - goto err_out; - } else if (strstart(cmd_name, "query-", &query_cmd)) { + if (strstart(cmd_name, "query-", &query_cmd)) { cmd = qmp_find_query_cmd(query_cmd); } else { cmd = qmp_find_cmd(cmd_name); } - if (!cmd || !monitor_handler_ported(cmd) || monitor_cmd_user_only(cmd)) { + if (!cmd) { qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name); goto err_out; } -- 1.7.3.rc2.dirty