Revision f36b4afb
| b/Makefile.target | ||
|---|---|---|
| 307 | 307 |
|
| 308 | 308 |
main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) |
| 309 | 309 |
|
| 310 |
monitor.o: qemu-monitor.h |
|
| 310 |
monitor.o: qemu-monitor.h qmp-commands.h
|
|
| 311 | 311 |
|
| 312 | 312 |
$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS) |
| 313 | 313 |
|
| ... | ... | |
| 331 | 331 |
qemu-monitor.h: $(SRC_PATH)/qemu-monitor.hx |
| 332 | 332 |
$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") |
| 333 | 333 |
|
| 334 |
qmp-commands.h: $(SRC_PATH)/qmp-commands.hx |
|
| 335 |
$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") |
|
| 336 |
|
|
| 334 | 337 |
clean: |
| 335 | 338 |
rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o |
| 336 | 339 |
rm -f *.d */*.d tcg/*.o ide/*.o |
| 337 |
rm -f qemu-monitor.h gdbstub-xml.c |
|
| 340 |
rm -f qemu-monitor.h qmp-commands.h gdbstub-xml.c
|
|
| 338 | 341 |
|
| 339 | 342 |
install: all |
| 340 | 343 |
ifneq ($(PROGS),) |
| b/monitor.c | ||
|---|---|---|
| 189 | 189 |
static const mon_cmd_t mon_cmds[]; |
| 190 | 190 |
static const mon_cmd_t info_cmds[]; |
| 191 | 191 |
|
| 192 |
static const mon_cmd_t qmp_cmds[]; |
|
| 193 |
|
|
| 192 | 194 |
Monitor *cur_mon; |
| 193 | 195 |
Monitor *default_mon; |
| 194 | 196 |
|
| ... | ... | |
| 745 | 747 |
|
| 746 | 748 |
cmd_list = qlist_new(); |
| 747 | 749 |
|
| 748 |
for (cmd = mon_cmds; cmd->name != NULL; cmd++) {
|
|
| 750 |
for (cmd = qmp_cmds; cmd->name != NULL; cmd++) {
|
|
| 749 | 751 |
if (monitor_handler_ported(cmd) && !monitor_cmd_user_only(cmd) && |
| 750 | 752 |
!compare_cmd(cmd->name, "info")) {
|
| 751 | 753 |
qlist_append_obj(cmd_list, get_cmd_dict(cmd->name)); |
| ... | ... | |
| 2635 | 2637 |
}, |
| 2636 | 2638 |
}; |
| 2637 | 2639 |
|
| 2640 |
static const mon_cmd_t qmp_cmds[] = {
|
|
| 2641 |
#include "qmp-commands.h" |
|
| 2642 |
{ /* NULL */ },
|
|
| 2643 |
}; |
|
| 2644 |
|
|
| 2638 | 2645 |
/*******************************************************************/ |
| 2639 | 2646 |
|
| 2640 | 2647 |
static const char *pch; |
| ... | ... | |
| 3367 | 3374 |
|
| 3368 | 3375 |
static const mon_cmd_t *qmp_find_cmd(const char *cmdname) |
| 3369 | 3376 |
{
|
| 3370 |
return search_dispatch_table(mon_cmds, cmdname);
|
|
| 3377 |
return search_dispatch_table(qmp_cmds, cmdname);
|
|
| 3371 | 3378 |
} |
| 3372 | 3379 |
|
| 3373 | 3380 |
static const mon_cmd_t *monitor_parse_command(Monitor *mon, |
Also available in: Unified diff