diff options
| -rw-r--r-- | monitor.c | 18 |
1 files changed, 18 insertions, 0 deletions
@@ -44,6 +44,9 @@ #include "migration.h" #include "kvm.h" #include "acl.h" +#include "qint.h" +#include "qdict.h" +#include "qstring.h" //#define DEBUG //#define DEBUG_COMPLETION @@ -2548,6 +2551,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) char cmdname[256]; char buf[1024]; char *key; + QDict *qdict; void *str_allocated[MAX_ARGS]; void *args[MAX_ARGS]; void (*handler_0)(Monitor *mon); @@ -2592,6 +2596,8 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) return; } + qdict = qdict_new(); + for(i = 0; i < MAX_ARGS; i++) str_allocated[i] = NULL; @@ -2649,6 +2655,8 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) goto fail; } args[nb_args++] = str; + if (str) + qdict_put(qdict, key, qstring_from_str(str)); } break; case '/': @@ -2730,12 +2738,16 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) args[nb_args++] = (void*)(long)count; args[nb_args++] = (void*)(long)format; args[nb_args++] = (void*)(long)size; + qdict_put(qdict, "count", qint_from_int(count)); + qdict_put(qdict, "format", qint_from_int(format)); + qdict_put(qdict, "size", qint_from_int(size)); } break; case 'i': case 'l': { int64_t val; + int dict_add = 1; while (qemu_isspace(*p)) p++; @@ -2758,6 +2770,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) typestr++; if (nb_args >= MAX_ARGS) goto error_args; + dict_add = has_arg; args[nb_args++] = (void *)(long)has_arg; if (!has_arg) { if (nb_args >= MAX_ARGS) @@ -2773,6 +2786,8 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) if (nb_args >= MAX_ARGS) goto error_args; args[nb_args++] = (void *)(long)val; + if (dict_add) + qdict_put(qdict, key, qint_from_int(val)); } else { if ((nb_args + 1) >= MAX_ARGS) goto error_args; @@ -2782,6 +2797,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) args[nb_args++] = (void *)0; #endif args[nb_args++] = (void *)(long)(val & 0xffffffff); + qdict_put(qdict, key, qint_from_int(val)); } } break; @@ -2809,6 +2825,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) if (nb_args >= MAX_ARGS) goto error_args; args[nb_args++] = (void *)(long)has_option; + qdict_put(qdict, key, qint_from_int(has_option)); } break; default: @@ -2888,6 +2905,7 @@ static void monitor_handle_command(Monitor *mon, const char *cmdline) qemu_free(key); for(i = 0; i < MAX_ARGS; i++) qemu_free(str_allocated[i]); + QDECREF(qdict); } static void cmd_completion(const char *name, const char *list) |