From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGbhP-00016I-53 for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:07 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGbhK-0000zp-DI for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:06 -0500 Received: from [199.232.76.173] (port=44832 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGbhK-0000zd-4v for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:15024) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NGbhK-0008OV-1l for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:02 -0500 From: Luiz Capitulino Date: Fri, 4 Dec 2009 15:11:26 -0200 Message-Id: <1259946695-15784-9-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1259946695-15784-1-git-send-email-lcapitulino@redhat.com> References: <1259946695-15784-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 08/17] monitor: Convert do_info_name() 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 Return a QString with the current VM name. Signed-off-by: Luiz Capitulino --- monitor.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index d3ab2ab..96fde16 100644 --- a/monitor.c +++ b/monitor.c @@ -507,10 +507,15 @@ static void do_info_version(Monitor *mon, QObject **ret_data) *ret_data = QOBJECT(qstring_from_str(QEMU_VERSION QEMU_PKGVERSION)); } -static void do_info_name(Monitor *mon) +/** + * do_info_name(): Show VM name + * + * Return a QString with the current VM name. + */ +static void do_info_name(Monitor *mon, QObject **ret_data) { if (qemu_name) - monitor_printf(mon, "%s\n", qemu_name); + *ret_data = QOBJECT(qstring_from_str(qemu_name)); } /** @@ -2385,7 +2390,8 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the current VM name", - .mhandler.info = do_info_name, + .user_print = monitor_print_qobject, + .mhandler.info_new = do_info_name, }, { .name = "uuid", -- 1.6.6.rc1.5.ge21a85