From ab2d3187620e98f23c84b991e1c8d70aefc76198 Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Wed, 7 Oct 2009 13:42:02 -0300 Subject: [PATCH] monitor: Convert do_info_version() to QObject The returned data is always a QString. Also introduces monitor_print_qobject(), which can be used as a standard way to print QObjects in the user protocol format. Patchworks-ID: 35350 Signed-off-by: Luiz Capitulino Signed-off-by: Anthony Liguori --- monitor.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 22e87abd34..8c9cc9b190 100644 --- a/monitor.c +++ b/monitor.c @@ -223,6 +223,24 @@ static inline int monitor_handler_ported(const mon_cmd_t *cmd) return cmd->user_print != NULL; } +static void monitor_print_qobject(Monitor *mon, const QObject *data) +{ + switch (qobject_type(data)) { + case QTYPE_QSTRING: + monitor_printf(mon, "%s",qstring_get_str(qobject_to_qstring(data))); + break; + case QTYPE_QINT: + monitor_printf(mon, "%" PRId64,qint_get_int(qobject_to_qint(data))); + break; + default: + monitor_printf(mon, "ERROR: unsupported type: %d", + qobject_type(data)); + break; + } + + monitor_puts(mon, "\n"); +} + static int compare_cmd(const char *name, const char *list) { const char *p, *pstart; @@ -322,9 +340,12 @@ help: help_cmd(mon, "info"); } -static void do_info_version(Monitor *mon) +/** + * do_info_version(): Show QEMU version + */ +static void do_info_version(Monitor *mon, QObject **ret_data) { - monitor_printf(mon, "%s\n", QEMU_VERSION QEMU_PKGVERSION); + *ret_data = QOBJECT(qstring_from_str(QEMU_VERSION QEMU_PKGVERSION)); } static void do_info_name(Monitor *mon) @@ -1860,7 +1881,8 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the version of QEMU", - .mhandler.info = do_info_version, + .user_print = monitor_print_qobject, + .mhandler.info_new = do_info_version, }, { .name = "network", -- 2.11.4.GIT