From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvZbS-0002W7-4r for qemu-devel@nongnu.org; Wed, 07 Oct 2009 12:43:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvZbM-0002Tc-Ry for qemu-devel@nongnu.org; Wed, 07 Oct 2009 12:43:01 -0400 Received: from [199.232.76.173] (port=49993 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvZbM-0002TM-FI for qemu-devel@nongnu.org; Wed, 07 Oct 2009 12:42:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42092) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvZbL-0005WU-OQ for qemu-devel@nongnu.org; Wed, 07 Oct 2009 12:42:56 -0400 From: Luiz Capitulino Date: Wed, 7 Oct 2009 13:42:02 -0300 Message-Id: <1254933724-22485-17-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1254933724-22485-1-git-send-email-lcapitulino@redhat.com> References: <1254933724-22485-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 16/18] monitor: Convert do_info_version() to QObject List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, avi@redhat.com 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. Signed-off-by: Luiz Capitulino --- monitor.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 22e87ab..8c9cc9b 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", -- 1.6.5.rc2.17.gdbc1b