[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/18] QMP: Introduce query commands dispatch table
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 10/18] QMP: Introduce query commands dispatch table |
Date: |
Thu, 16 Sep 2010 17:20:56 -0300 |
The new table is a copy of HMP's table, containing only QObject
handlers.
In the near future HMP will be making QMP calls and then we will
be able to drop QObject handlers from HMP's table.
>From now on, QMP and HMP have different query command dispatch
tables.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 128 insertions(+), 2 deletions(-)
diff --git a/monitor.c b/monitor.c
index fe1a29a..53f8665 100644
--- a/monitor.c
+++ b/monitor.c
@@ -190,6 +190,7 @@ static const mon_cmd_t mon_cmds[];
static const mon_cmd_t info_cmds[];
static const mon_cmd_t qmp_cmds[];
+static const mon_cmd_t qmp_query_cmds[];
Monitor *cur_mon;
Monitor *default_mon;
@@ -751,7 +752,7 @@ static void do_info_commands(Monitor *mon, QObject
**ret_data)
}
}
- for (cmd = info_cmds; cmd->name != NULL; cmd++) {
+ for (cmd = qmp_query_cmds; cmd->name != NULL; cmd++) {
if (monitor_handler_ported(cmd) && !monitor_cmd_user_only(cmd)) {
char buf[128];
snprintf(buf, sizeof(buf), "query-%s", cmd->name);
@@ -2639,6 +2640,131 @@ static const mon_cmd_t qmp_cmds[] = {
{ /* NULL */ },
};
+static const mon_cmd_t qmp_query_cmds[] = {
+ {
+ .name = "version",
+ .args_type = "",
+ .params = "",
+ .help = "show the version of QEMU",
+ .user_print = do_info_version_print,
+ .mhandler.info_new = do_info_version,
+ },
+ {
+ .name = "commands",
+ .args_type = "",
+ .params = "",
+ .help = "list QMP available commands",
+ .user_print = monitor_user_noop,
+ .mhandler.info_new = do_info_commands,
+ },
+ {
+ .name = "chardev",
+ .args_type = "",
+ .params = "",
+ .help = "show the character devices",
+ .user_print = qemu_chr_info_print,
+ .mhandler.info_new = qemu_chr_info,
+ },
+ {
+ .name = "block",
+ .args_type = "",
+ .params = "",
+ .help = "show the block devices",
+ .user_print = bdrv_info_print,
+ .mhandler.info_new = bdrv_info,
+ },
+ {
+ .name = "blockstats",
+ .args_type = "",
+ .params = "",
+ .help = "show block device statistics",
+ .user_print = bdrv_stats_print,
+ .mhandler.info_new = bdrv_info_stats,
+ },
+ {
+ .name = "cpus",
+ .args_type = "",
+ .params = "",
+ .help = "show infos for each CPU",
+ .user_print = monitor_print_cpus,
+ .mhandler.info_new = do_info_cpus,
+ },
+ {
+ .name = "pci",
+ .args_type = "",
+ .params = "",
+ .help = "show PCI info",
+ .user_print = do_pci_info_print,
+ .mhandler.info_new = do_pci_info,
+ },
+ {
+ .name = "kvm",
+ .args_type = "",
+ .params = "",
+ .help = "show KVM information",
+ .user_print = do_info_kvm_print,
+ .mhandler.info_new = do_info_kvm,
+ },
+ {
+ .name = "status",
+ .args_type = "",
+ .params = "",
+ .help = "show the current VM status (running|paused)",
+ .user_print = do_info_status_print,
+ .mhandler.info_new = do_info_status,
+ },
+ {
+ .name = "mice",
+ .args_type = "",
+ .params = "",
+ .help = "show which guest mouse is receiving events",
+ .user_print = do_info_mice_print,
+ .mhandler.info_new = do_info_mice,
+ },
+ {
+ .name = "vnc",
+ .args_type = "",
+ .params = "",
+ .help = "show the vnc server status",
+ .user_print = do_info_vnc_print,
+ .mhandler.info_new = do_info_vnc,
+ },
+ {
+ .name = "name",
+ .args_type = "",
+ .params = "",
+ .help = "show the current VM name",
+ .user_print = do_info_name_print,
+ .mhandler.info_new = do_info_name,
+ },
+ {
+ .name = "uuid",
+ .args_type = "",
+ .params = "",
+ .help = "show the current VM UUID",
+ .user_print = do_info_uuid_print,
+ .mhandler.info_new = do_info_uuid,
+ },
+ {
+ .name = "migrate",
+ .args_type = "",
+ .params = "",
+ .help = "show migration status",
+ .user_print = do_info_migrate_print,
+ .mhandler.info_new = do_info_migrate,
+ },
+ {
+ .name = "balloon",
+ .args_type = "",
+ .params = "",
+ .help = "show balloon information",
+ .user_print = monitor_print_balloon,
+ .mhandler.info_async = do_info_balloon,
+ .flags = MONITOR_CMD_ASYNC,
+ },
+ { /* NULL */ },
+};
+
/*******************************************************************/
static const char *pch;
@@ -3366,7 +3492,7 @@ static const mon_cmd_t *monitor_find_command(const char
*cmdname)
static const mon_cmd_t *qmp_find_query_cmd(const char *info_item)
{
- return find_dispatch_table(info_cmds, info_item);
+ return find_dispatch_table(qmp_query_cmds, info_item);
}
static const mon_cmd_t *qmp_find_cmd(const char *cmdname)
--
1.7.3.rc2.dirty
- Re: [Qemu-devel] [PATCH 05/18] Monitor: Drop is_async_return(), (continued)
[Qemu-devel] [PATCH 06/18] Monitor: Convert do_info() back to HMP, Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 08/18] QMP: Introduce qmp_find_cmd(), Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 09/18] QMP: Introduce command dispatch table, Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 07/18] Monitor: Introduce the qemu-monitor-qmp.hx file, Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 10/18] QMP: Introduce query commands dispatch table,
Luiz Capitulino <=
[Qemu-devel] [PATCH 11/18] QMP: Simplify do_info_commands(), Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 14/18] Monitor: Drop monitor_cmd_user_only(), Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 13/18] Monitor: Drop QMP info from the qemu-monitor.hx file, Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 15/18] Monitor: Rename monitor_handler_ported(), Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 16/18] Monitor: Rename monitor_handler_is_async(), Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 17/18] Monitor: Directly call QObject handlers, Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 12/18] QMP: Small cleanup in handle_qmp_command(), Luiz Capitulino, 2010/09/16
[Qemu-devel] [PATCH 18/18] QMP: Introduce qmp_call_cmd(), Luiz Capitulino, 2010/09/16
Re: [Qemu-devel] [PATCH 00/18] Monitor: split HMP and QMP dispatch tables, Anthony Liguori, 2010/09/21