From patchwork Fri Oct 1 18:19:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 66503 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 894B5B6EE8 for ; Sat, 2 Oct 2010 05:43:49 +1000 (EST) Received: from localhost ([127.0.0.1]:32932 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1ko3-0003AP-M0 for incoming@patchwork.ozlabs.org; Fri, 01 Oct 2010 14:58:07 -0400 Received: from [140.186.70.92] (port=49578 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1kDe-0006G4-FA for qemu-devel@nongnu.org; Fri, 01 Oct 2010 14:21:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P1kD9-0003LZ-JR for qemu-devel@nongnu.org; Fri, 01 Oct 2010 14:20:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44309) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P1kD9-0003LR-Bf for qemu-devel@nongnu.org; Fri, 01 Oct 2010 14:19:59 -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 o91IJwWs018297 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 1 Oct 2010 14:19:58 -0400 Received: from localhost (ovpn-113-58.phx2.redhat.com [10.3.113.58]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o91IJv2o004386; Fri, 1 Oct 2010 14:19:58 -0400 From: Luiz Capitulino To: aliguori@us.ibm.com Date: Fri, 1 Oct 2010 15:19:16 -0300 Message-Id: <1285957167-1228-13-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1285957167-1228-1-git-send-email-lcapitulino@redhat.com> References: <1285957167-1228-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 12/23] QMP: Introduce command dispatch table 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 Also update QMP functions to use it. The table is generated from the qmp-commands.hx file. From now on, QMP and HMP have different command dispatch tables. Signed-off-by: Luiz Capitulino --- Makefile.target | 7 +++++-- monitor.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile.target b/Makefile.target index 91d0381..3a1fa7e 100644 --- a/Makefile.target +++ b/Makefile.target @@ -307,7 +307,7 @@ obj-alpha-y = alpha_palcode.o main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) -monitor.o: qemu-monitor.h +monitor.o: qemu-monitor.h qmp-commands.h $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) @@ -331,10 +331,13 @@ gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/feature_to_c.sh qemu-monitor.h: $(SRC_PATH)/qemu-monitor.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") +qmp-commands.h: $(SRC_PATH)/qmp-commands.hx + $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") + clean: rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o rm -f *.d */*.d tcg/*.o ide/*.o - rm -f qemu-monitor.h gdbstub-xml.c + rm -f qemu-monitor.h qmp-commands.h gdbstub-xml.c install: all ifneq ($(PROGS),) diff --git a/monitor.c b/monitor.c index f62c34a..06141a5 100644 --- a/monitor.c +++ b/monitor.c @@ -189,6 +189,8 @@ static QLIST_HEAD(mon_list, Monitor) mon_list; static const mon_cmd_t mon_cmds[]; static const mon_cmd_t info_cmds[]; +static const mon_cmd_t qmp_cmds[]; + Monitor *cur_mon; Monitor *default_mon; @@ -745,7 +747,7 @@ static void do_info_commands(Monitor *mon, QObject **ret_data) cmd_list = qlist_new(); - for (cmd = mon_cmds; cmd->name != NULL; cmd++) { + for (cmd = qmp_cmds; cmd->name != NULL; cmd++) { if (monitor_handler_ported(cmd) && !monitor_cmd_user_only(cmd) && !compare_cmd(cmd->name, "info")) { qlist_append_obj(cmd_list, get_cmd_dict(cmd->name)); @@ -2635,6 +2637,11 @@ static const mon_cmd_t info_cmds[] = { }, }; +static const mon_cmd_t qmp_cmds[] = { +#include "qmp-commands.h" + { /* NULL */ }, +}; + /*******************************************************************/ static const char *pch; @@ -3367,7 +3374,7 @@ static const mon_cmd_t *qmp_find_query_cmd(const char *info_item) static const mon_cmd_t *qmp_find_cmd(const char *cmdname) { - return search_dispatch_table(mon_cmds, cmdname); + return search_dispatch_table(qmp_cmds, cmdname); } static const mon_cmd_t *monitor_parse_command(Monitor *mon,