From patchwork Thu Sep 30 20:56:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [12/19] QMP: Small cleanup in handle_qmp_command() Date: Thu, 30 Sep 2010 10:56:13 -0000 From: Luiz Capitulino X-Patchwork-Id: 66257 Message-Id: <1285880180-29724-13-git-send-email-lcapitulino@redhat.com> 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 dbf6e18..bc8d054 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; }