From patchwork Thu Sep 16 20:20:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 65008 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 CDD67B70E1 for ; Fri, 17 Sep 2010 07:04:41 +1000 (EST) Received: from localhost ([127.0.0.1]:33608 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwLOk-0007uv-DJ for incoming@patchwork.ozlabs.org; Thu, 16 Sep 2010 16:49:38 -0400 Received: from [140.186.70.92] (port=39568 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwKxW-0000Z0-RN for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OwKxV-0001QH-Hi for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31644) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OwKxV-0001Q1-Bh for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:29 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8GKLS0i013189 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Sep 2010 16:21:28 -0400 Received: from localhost ([10.3.113.6]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8GKLRhh031795; Thu, 16 Sep 2010 16:21:28 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 16 Sep 2010 17:20:55 -0300 Message-Id: <1284668464-15981-10-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> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 09/18] 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 qemu-monitor-qmp.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 a4e80b1..7fab81b 100644 --- a/Makefile.target +++ b/Makefile.target @@ -299,7 +299,7 @@ obj-alpha-y = alpha_palcode.o main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) -monitor.o: qemu-monitor.h +monitor.o: qemu-monitor.h qemu-monitor-qmp.h $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) @@ -323,10 +323,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)$@") +qemu-monitor-qmp.h: $(SRC_PATH)/qemu-monitor-qmp.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-monitor-qmp.h gdbstub-xml.c install: all ifneq ($(PROGS),) diff --git a/monitor.c b/monitor.c index 7b699db..fe1a29a 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; @@ -742,7 +744,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)); @@ -2632,6 +2634,11 @@ static const mon_cmd_t info_cmds[] = { }, }; +static const mon_cmd_t qmp_cmds[] = { +#include "qemu-monitor-qmp.h" + { /* NULL */ }, +}; + /*******************************************************************/ static const char *pch; @@ -3364,7 +3371,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 find_dispatch_table(mon_cmds, cmdname); + return find_dispatch_table(qmp_cmds, cmdname); } static const mon_cmd_t *monitor_parse_command(Monitor *mon,