On Fri, 23 Aug 2013 16:17:52 +0800 Wenchao Xia <xiaw...@linux.vnet.ibm.com> wrote:
> This series make auto completion and help functions works normal for sub > command, by using reentrant functions. In order to do that, global variables > are not directly used in those functions any more. With this series, cmd_table > is a member of structure Monitor so it is possible to create a monitor with > different command table now, auto completion will work in that monitor. In > short, "info" is not treated as a special case now, this series ensure help > and auto complete function works normal for any sub command added in the > future. > > Patch 5 replaced cur_mon with rs->mon, it is safe because: > monitor_init() calls readline_init() which initialize mon->rs, result is > mon->rs->mon == mon. Then qemu_chr_add_handlers() is called, which make > monitor_read() function take *mon as its opaque. Later, when user input, > monitor_read() is called, where cur_mon is set to *mon by "cur_mon = opaque". > If qemu's monitors run in one thread, then later in readline_handle_byte() > and readline_comletion(), cur_mon is actually equal to rs->mon, in another > word, it points to the monitor instance, so it is safe to replace *cur_mon > in those functions. > > Thanks for Luiz and Eric for reviewing. This one doesn't even build :( /home/lcapitulino/work/src/upstream/qmp-unstable/monitor.c: In function ‘help_cmd’: /home/lcapitulino/work/src/upstream/qmp-unstable/monitor.c:952:1: error: label ‘cleanup’ defined but not used [-Werror=unused-label] cc1: all warnings being treated as errors make[1]: *** [monitor.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make: *** [subdir-x86_64-softmmu] Error 2