From patchwork Tue Nov 17 20:32:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 38697 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 52541B6F18 for ; Wed, 18 Nov 2009 10:35:41 +1100 (EST) Received: from localhost ([127.0.0.1]:43484 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAUsC-0000CL-FY for incoming@patchwork.ozlabs.org; Tue, 17 Nov 2009 15:42:00 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NAUjJ-0004OL-BI for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:49 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NAUjE-0004LQ-8s for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:48 -0500 Received: from [199.232.76.173] (port=34680 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NAUjE-0004LC-2o for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52411) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NAUjD-00087F-7o for qemu-devel@nongnu.org; Tue, 17 Nov 2009 15:32:43 -0500 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nAHKWg0Y027733 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Nov 2009 15:32:42 -0500 Received: from localhost (vpn-11-203.rdu.redhat.com [10.11.11.203]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nAHKWfkE032553 for ; Tue, 17 Nov 2009 15:32:42 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Tue, 17 Nov 2009 18:32:12 -0200 Message-Id: <1258489944-12159-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1258489944-12159-1-git-send-email-lcapitulino@redhat.com> References: <1258489944-12159-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 05/17] monitor: Convert do_info_status() 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 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 3286ba2..72de320 100644 --- a/monitor.c +++ b/monitor.c @@ -1678,16 +1678,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); } /** @@ -2117,7 +2137,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",