From patchwork Wed Oct 7 00:27:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 35185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C8C06B7B7C for ; Wed, 7 Oct 2009 11:50:17 +1100 (EST) Received: from localhost ([127.0.0.1]:55901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvKjP-0001lm-9Z for incoming@patchwork.ozlabs.org; Tue, 06 Oct 2009 20:50:15 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MvKNq-0001kC-T0 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:59 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MvKNp-0001iw-A0 for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:58 -0400 Received: from [199.232.76.173] (port=45753 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MvKNp-0001in-4e for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1025) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MvKNo-00076Q-Nw for qemu-devel@nongnu.org; Tue, 06 Oct 2009 20:27:57 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n970RtS6017097; Tue, 6 Oct 2009 20:27:56 -0400 Received: from localhost (vpn-12-79.rdu.redhat.com [10.11.12.79]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n970RsSA027961; Tue, 6 Oct 2009 20:27:55 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 6 Oct 2009 21:27:10 -0300 Message-Id: <1254875232-25012-14-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1254875232-25012-1-git-send-email-lcapitulino@redhat.com> References: <1254875232-25012-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, avi@redhat.com Subject: [Qemu-devel] [PATCH 13/15] monitor: Convert do_info_version() to QObject X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index cb28ffb..2a1e4d7 100644 --- a/monitor.c +++ b/monitor.c @@ -218,6 +218,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; @@ -323,9 +341,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,7 @@ static const mon_cmd_t info_cmds[] = { .name = "version", .args_type = "", .handler = do_info_version, - .user_print = NULL, + .user_print = monitor_print_qobject, .params = "", .help = "show the version of QEMU" },