[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V4 2/4] HMP: add infrastructure for sub command
From: |
Wenchao Xia |
Subject: |
[Qemu-devel] [PATCH V4 2/4] HMP: add infrastructure for sub command |
Date: |
Thu, 10 Jan 2013 16:32:32 +0800 |
This patch make parsing of hmp command aware of that it may
have sub command. Also discard simple encapsulation function
monitor_find_command() and qmp_find_cmd().
Signed-off-by: Wenchao Xia <address@hidden>
---
monitor.c | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/monitor.c b/monitor.c
index c7b3014..d49a362 100644
--- a/monitor.c
+++ b/monitor.c
@@ -130,6 +130,7 @@ typedef struct mon_cmd_t {
MonitorCompletion *cb, void *opaque);
} mhandler;
int flags;
+ struct mon_cmd_t *sub_table;
} mon_cmd_t;
/* file descriptors passed via SCM_RIGHTS */
@@ -3534,21 +3535,22 @@ static const mon_cmd_t *search_dispatch_table(const
mon_cmd_t *disp_table,
return NULL;
}
-static const mon_cmd_t *monitor_find_command(const char *cmdname)
-{
- return search_dispatch_table(mon_cmds, cmdname);
-}
-
static const mon_cmd_t *qmp_find_cmd(const char *cmdname)
{
return search_dispatch_table(qmp_cmds, cmdname);
}
+/*
+ * Try find the target mon_cmd_t instance. If it have sub_table and have string
+ * for it, this function will try search it with remaining string, and if not
+ * found it return NULL.
+ */
static const mon_cmd_t *monitor_parse_command(Monitor *mon,
const char *cmdline,
+ mon_cmd_t *table,
QDict *qdict)
{
- const char *p, *typestr;
+ const char *p, *p1, *typestr;
int c;
const mon_cmd_t *cmd;
char cmdname[256];
@@ -3564,12 +3566,25 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
if (!p)
return NULL;
- cmd = monitor_find_command(cmdname);
+ cmd = search_dispatch_table(table, cmdname);
if (!cmd) {
monitor_printf(mon, "unknown command: '%s'\n", cmdname);
return NULL;
}
+ /* search sub command */
+ if (cmd->sub_table != NULL) {
+ p1 = p;
+ /* check if user set additional command */
+ while (qemu_isspace(*p1)) {
+ p1++;
+ }
+ if (*p1 == '\0') {
+ return cmd;
+ }
+ return monitor_parse_command(mon, p, cmd->sub_table, qdict);
+ }
+
/* parse the parameters */
typestr = cmd->args_type;
for(;;) {
@@ -3925,7 +3940,7 @@ static void handle_user_command(Monitor *mon, const char
*cmdline)
qdict = qdict_new();
- cmd = monitor_parse_command(mon, cmdline, qdict);
+ cmd = monitor_parse_command(mon, cmdline, mon_cmds, qdict);
if (!cmd)
goto out;
--
1.7.1