From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGbhL-00011g-HV for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:03 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGbhG-0000uC-Hc for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:12:02 -0500 Received: from [199.232.76.173] (port=44828 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGbhG-0000u2-Dd for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:11:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2873) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NGbhF-0008Nq-MY for qemu-devel@nongnu.org; Fri, 04 Dec 2009 12:11:58 -0500 From: Luiz Capitulino Date: Fri, 4 Dec 2009 15:11:24 -0200 Message-Id: <1259946695-15784-7-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 06/17] monitor: Convert do_info_status() 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 status information. Signed-off-by: Luiz Capitulino --- monitor.c | 33 +++++++++++++++++++++++++++------ 1 files changed, 27 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 8cedfa9..03f5d7a 100644 --- a/monitor.c +++ b/monitor.c @@ -1865,16 +1865,36 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict) } #endif -static void do_info_status(Monitor *mon) +static void do_info_status_print(Monitor *mon, const QObject *data) { + monitor_printf(mon, "VM status: %s\n", + qstring_get_str(qobject_to_qstring(data))); +} + +/** + * do_info_status(): VM status + * + * Return a QString with status information, which can be: + * + * - "running" + * - "running (single step mode)" + * - "paused" + */ +static void do_info_status(Monitor *mon, QObject **ret_data) +{ + QString *qs; + if (vm_running) { if (singlestep) { - monitor_printf(mon, "VM status: running (single step mode)\n"); + qs = qstring_from_str("running (single step mode)"); } else { - monitor_printf(mon, "VM status: running\n"); + qs = qstring_from_str("running"); } - } else - monitor_printf(mon, "VM status: paused\n"); + } else { + qs = qstring_from_str("paused"); + } + + *ret_data = QOBJECT(qs); } /** @@ -2317,7 +2337,8 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the current VM status (running|paused)", - .mhandler.info = do_info_status, + .user_print = do_info_status_print, + .mhandler.info_new = do_info_status, }, { .name = "pcmcia", -- 1.6.6.rc1.5.ge21a85