From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=51752 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P0x0U-0003Sy-37 for qemu-devel@nongnu.org; Wed, 29 Sep 2010 09:47:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1P0x0O-0003cb-Lf for qemu-devel@nongnu.org; Wed, 29 Sep 2010 09:47:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34122) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P0x0O-0003cI-D4 for qemu-devel@nongnu.org; Wed, 29 Sep 2010 09:47:32 -0400 Date: Wed, 29 Sep 2010 10:47:27 -0300 From: Luiz Capitulino Subject: Re: [Qemu-devel] [PATCH 09/18] QMP: Introduce command dispatch table Message-ID: <20100929104727.2d7329b2@doriath> In-Reply-To: References: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> <1284668464-15981-10-git-send-email-lcapitulino@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: aliguori@us.ibm.com, qemu-devel@nongnu.org On Wed, 29 Sep 2010 13:31:13 +0200 Markus Armbruster wrote: > Luiz Capitulino writes: > > > 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 > > Typo: qmp-monitor-qmp.h instead of qemu-monitor-qmp.h. > > I'm not thrilled about qemu-monitor-qmp; because if I expand the > abbreviation, I get "QEMU monitor QEMU Monitor Protocol". > > What about just qmp? I think qmp-commands is better, but then I'll also change qemu-monitor.hx to hmp-commands.hx. Objections? > [...] > > 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)); > > We need to switch here, because "info commands" is about QMP commands, > not about HMP commands. Curious, isn't it? Drop the compare_cmd() and change the function's name, you mean? > > @@ -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, >