[Qemu-devel] [PATCH v4 13/23] monitor: Allow to specify HMP-specifc command arguments

[Jan Kiszka]

From: Jan Kiszka <address@hidden>

As we may want to shrink or enhance the argument set used for monitor
command in HMP mode, add a separate, optional argument string for that
case. When an HMP request is parsed, this argument string, if available,
takes precedence over the standard string.

Signed-off-by: Jan Kiszka <address@hidden>
---
 monitor.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index f535c56..7139c4e 100644
--- a/monitor.c
+++ b/monitor.c
@@ -108,6 +108,7 @@ typedef struct mon_cmd_t {
     const char *params;
     const char *help;
     void (*user_print)(Monitor *mon, const QObject *data);
+    const char *user_args_type;
     union {
         void (*info)(Monitor *mon);
         void (*info_new)(Monitor *mon, QObject **ret_data);
@@ -3310,7 +3311,7 @@ static const mon_cmd_t *monitor_parse_command(Monitor 
*mon,
     }
 
     /* parse the parameters */
-    typestr = cmd->args_type;
+    typestr = cmd->user_args_type ? : cmd->args_type;
     for(;;) {
         typestr = key_get_info(typestr, &key);
         if (!typestr)
@@ -4040,7 +4041,7 @@ static void monitor_find_completion(const char *cmdline)
             goto cleanup;
         }
 
-        ptype = next_arg_type(cmd->args_type);
+        ptype = next_arg_type(cmd->user_args_type ? : cmd->args_type);
         for(i = 0; i < nb_args - 2; i++) {
             if (*ptype != '\0') {
                 ptype = next_arg_type(ptype);
-- 
1.6.0.2