[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/15] monitor: Handle new and old style handlers
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 05/15] monitor: Handle new and old style handlers |
Date: |
Tue, 6 Oct 2009 21:27:02 -0300 |
This commit changes monitor_handle_command() to support old style
_and_ new style handlers.
New style handlers are protocol independent, they return their
data to the Monitor, which in turn decides how to print them
(ie. user protocol vs. machine protocol).
Converted handlers will use the 'user_print' member of 'mon_cmd_t'
to define its user protocol function, which will be called to print
data in the user protocol format.
Handlers which don't have 'user_print' defined are not converted
and are handled as usual.
Signed-off-by: Luiz Capitulino <address@hidden>
---
monitor.c | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index 9d4c168..c0ba5ee 100644
--- a/monitor.c
+++ b/monitor.c
@@ -211,6 +211,11 @@ static int monitor_fprintf(FILE *stream, const char *fmt,
...)
return 0;
}
+static inline int monitor_handler_ported(const mon_cmd_t *cmd)
+{
+ return cmd->user_print != NULL;
+}
+
static int compare_cmd(const char *name, const char *list)
{
const char *p, *pstart;
@@ -3053,17 +3058,32 @@ static void monitor_handle_command(Monitor *mon, const
char *cmdline)
qdict = qdict_new();
cmd = monitor_parse_command(mon, cmdline, qdict);
- if (cmd) {
- void (*handler)(Monitor *mon, const QDict *qdict);
+ if (!cmd)
+ goto out;
+
+ qemu_errors_to_mon(mon);
- qemu_errors_to_mon(mon);
+ if (monitor_handler_ported(cmd)) {
+ QObject *data = NULL;
+ void (*handler_new)(Monitor *mon, const QDict *params,
+ QObject **ret_data);
- handler = cmd->handler;
- handler(mon, qdict);
+ handler_new = cmd->handler;
+ handler_new(mon, qdict, &data);
- qemu_errors_to_previous();
+ if (data)
+ cmd->user_print(mon, data);
+
+ qobject_decref(data);
+ } else {
+ void (*handler_old)(Monitor *mon, const QDict *qdict);
+ handler_old = cmd->handler;
+ handler_old(mon, qdict);
}
+ qemu_errors_to_previous();
+
+out:
QDECREF(qdict);
}
--
1.6.5.rc2.17.gdbc1b
- [Qemu-devel] [PATCH v2 00/15]: Initial QObject conversion, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 02/15] Introduce QList, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 01/15] QObject: Accept NULL, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 03/15] Introduce QList unit-tests, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 04/15] monitor: Add user_print() to mon_cmd_t, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 05/15] monitor: Handle new and old style handlers,
Luiz Capitulino <=
- [Qemu-devel] [PATCH 06/15] monitor: do_info(): handle new and old info handlers, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 07/15] monitor: Convert do_quit() do QObject, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 08/15] monitor: Convert do_stop() to QObject, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 09/15] monitor: Convert do_system_reset() to QObject, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 10/15] monitor: Convert do_system_powerdown() to QObject, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 11/15] monitor: Convert do_cont() to QObject, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 12/15] monitor: Convert do_balloon() to QObject, Luiz Capitulino, 2009/10/06
- [Qemu-devel] [PATCH 13/15] monitor: Convert do_info_version() to QObject, Luiz Capitulino, 2009/10/06