[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/25] monitor: Drop args[] from monitor_parse_comma
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 21/25] monitor: Drop args[] from monitor_parse_command() |
Date: |
Tue, 28 Jul 2009 19:05:09 -0300 |
Arguments are now passed through a dictionary.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 47 +++++++++++++++++------------------------------
1 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/monitor.c b/monitor.c
index 04cd94f..2f5025c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2697,12 +2697,11 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
struct qemu_dict *qdict)
{
const char *p, *typestr;
- int c, nb_args, has_arg, str_idx;
+ int c, nb_args, str_idx;
const mon_cmd_t *cmd;
char cmdname[256];
char buf[1024];
char *key;
- void *args[MAX_ARGS];
#ifdef DEBUG
monitor_printf(mon, "command='%s'\n", cmdline);
@@ -2777,9 +2776,10 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
monitor_printf(mon, "%s: too many arguments\n", cmdname);
goto fail;
}
- args[nb_args++] = str;
- if (str)
+ if (str) {
qemu_dict_add(qdict, key, str);
+ nb_args++;
+ }
}
break;
case '/':
@@ -2858,78 +2858,65 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
}
if (nb_args + 3 > MAX_ARGS)
goto error_args;
- args[nb_args++] = (void*)(long)count;
- args[nb_args++] = (void*)(long)format;
- args[nb_args++] = (void*)(long)size;
qemu_dict_add(qdict, "count", (void*)(long)count);
qemu_dict_add(qdict, "format", (void*)(long)format);
qemu_dict_add(qdict, "size", (void*)(long)size);
+ nb_args += 3;
}
break;
case 'i':
case 'l':
{
int64_t val;
- int qdict_add = 1;
while (qemu_isspace(*p))
p++;
if (*typestr == '?' || *typestr == '.') {
if (*typestr == '?') {
- if (*p == '\0')
- has_arg = 0;
- else
- has_arg = 1;
+ if (*p == '\0') {
+ typestr++;
+ break;
+ }
} else {
if (*p == '.') {
p++;
while (qemu_isspace(*p))
p++;
- has_arg = 1;
} else {
- has_arg = 0;
+ typestr++;
+ break;
}
}
typestr++;
if (nb_args >= MAX_ARGS)
goto error_args;
- qdict_add = has_arg;
- args[nb_args++] = (void *)(long)has_arg;
- if (!has_arg) {
- if (nb_args >= MAX_ARGS)
- goto error_args;
- val = -1;
- goto add_num;
- }
}
if (get_expr(mon, &val, &p))
goto fail;
- add_num:
if (c == 'i') {
if (nb_args >= MAX_ARGS)
goto error_args;
- args[nb_args++] = (void *)(long)val;
- if (qdict_add)
- qemu_dict_add(qdict, key, (void *)(long) val);
+ qemu_dict_add(qdict, key, (void *)(long) val);
+ nb_args++;
} else {
char *lkey;
if ((nb_args + 1) >= MAX_ARGS)
goto error_args;
lkey = key_append_high(key);
#if TARGET_PHYS_ADDR_BITS > 32
- args[nb_args++] = (void *)(long)((val >> 32) & 0xffffffff);
qemu_dict_add(qdict, lkey,
(void *)(long)((val >> 32) & 0xffffffff));
qemu_free(lkey);
+ nb_args++;
#else
- args[nb_args++] = (void *)0;
qemu_dict_add(qdict, lkey, (void *)0);
qemu_free(lkey);
+ nb_args++;
#endif
- args[nb_args++] = (void *)(long)(val & 0xffffffff);
lkey = key_append_low(key);
qemu_dict_add(qdict, lkey,(void *)(long)(val &
0xffffffff));
qemu_free(lkey);
+ nb_args++;
}
}
break;
@@ -2956,8 +2943,8 @@ static const mon_cmd_t *monitor_parse_command(Monitor
*mon,
}
if (nb_args >= MAX_ARGS)
goto error_args;
- args[nb_args++] = (void *)(long)has_option;
qemu_dict_add(qdict, key, (void *)(long)has_option);
+ nb_args++;
}
break;
default:
--
1.6.4.rc3.12.gdf73a
- [Qemu-devel] [PATCH 12/25] monitor: Port handler_3 to use the dictionary, (continued)
- [Qemu-devel] [PATCH 12/25] monitor: Port handler_3 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 14/25] monitor: Port handler_5 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 15/25] monitor: Port handler_6 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 16/25] monitor: Port handler_7 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 17/25] monitor: Drop handler_8 and handler_9 handling, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 18/25] monitor: Port handler_10 to use the dictionary, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 19/25] monitor: Split monitor_handle_command(), Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 20/25] monitor: Add a new index for str_allocated[], Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 21/25] monitor: Drop args[] from monitor_parse_command(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 22/25] monitor: Drop 'nb_args' from monitor_parse_command(), Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 23/25] Add check support, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 25/25] Introduce qemu-dict unit-tests, Luiz Capitulino, 2009/07/28
- [Qemu-devel] [PATCH 24/25] Introduce dictionary test data file, Luiz Capitulino, 2009/07/28