sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

monitor: Setup a QDict with arguments to handlers 

With this commit monitor_handle_command() will be able to setup a
QDict with arguments to command handlers.

However, the current 'args[]' method is still being used, next
changes will port commands to get their arguments from the dictionary.

Two changes are worth noting:

1. The '/' argument type always adds the following standard keys in the
dictionary: 'count', 'format' and 'size'. This way, the argument
name used in the 'args_type' string doesn't matter

2. The optional argument type '?' doesn't need to pass the additional
'has_arg' argument, hanlders can do the same check with qdict_haskey()

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-08-28 15:27:10 -03:00 committed by Anthony Liguori
parent 4d76d2ba9d
commit f7188bbea7
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
monitor.c
View File

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