[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/29] monitor: Setup a QDict with arguments to hand
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 07/29] monitor: Setup a QDict with arguments to handlers |
Date: |
Fri, 28 Aug 2009 15:27:10 -0300 |
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 <address@hidden>
---
monitor.c | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/monitor.c b/monitor.c
index 033e304..133863c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -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)
--
1.6.4.1.184.g2e117
- [Qemu-devel] [PATCH v3 00/29] QMonitor, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 01/29] Introduce QObject, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 02/29] Introduce QInt, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 03/29] Introduce QString, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 05/29] Add wrappers to functions used by the Monitor, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 06/29] monitor: New format for handlers argument types, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 04/29] Introduce QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 07/29] monitor: Setup a QDict with arguments to handlers,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 08/29] monitor: Export QDict header, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 10/29] monitor: Port handler_1 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 09/29] monitor: Port handler_0 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 11/29] monitor: Port handler_2 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 12/29] monitor: Port handler_3 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 13/29] monitor: Port handler_4 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 14/29] monitor: Port handler_5 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 15/29] monitor: Port handler_6 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 16/29] monitor: Port handler_7 to use QDict, Luiz Capitulino, 2009/08/28
- [Qemu-devel] [PATCH 17/29] monitor: Drop handler_8 and handler_9, Luiz Capitulino, 2009/08/28