From patchwork Wed Dec 9 16:27:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 40743 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 EC89CB7093 for ; Thu, 10 Dec 2009 03:53:31 +1100 (EST) Received: from localhost ([127.0.0.1]:47275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NIPn7-0005zv-AT for incoming@patchwork.ozlabs.org; Wed, 09 Dec 2009 11:53:29 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NIPZW-0008Oy-Mt for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:39:26 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NIPZR-0008M0-Vc for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:39:25 -0500 Received: from [199.232.76.173] (port=48825 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NIPZR-0008Lu-GE for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:39:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9062) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NIPZR-0007Ln-2b for qemu-devel@nongnu.org; Wed, 09 Dec 2009 11:39:21 -0500 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 nB9GdKS1024279 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 9 Dec 2009 11:39:20 -0500 Received: from localhost (vpn-9-2.rdu.redhat.com [10.11.9.2]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id nB9GdIWP013487; Wed, 9 Dec 2009 11:39:19 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 9 Dec 2009 14:27:47 -0200 Message-Id: <1260376078-8694-9-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1260376078-8694-1-git-send-email-lcapitulino@redhat.com> References: <1260376078-8694-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 Subject: [Qemu-devel] [PATCH 08/19] 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 Signed-off-by: Luiz Capitulino --- monitor.c | 44 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 35 insertions(+), 9 deletions(-) diff --git a/monitor.c b/monitor.c index 775e687..e7a6294 100644 --- a/monitor.c +++ b/monitor.c @@ -1910,16 +1910,41 @@ 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) { - if (vm_running) { - if (singlestep) { - monitor_printf(mon, "VM status: running (single step mode)\n"); - } else { - monitor_printf(mon, "VM status: running\n"); + QDict *qdict; + + qdict = qobject_to_qdict(data); + + monitor_printf(mon, "VM status: "); + if (qdict_get_bool(qdict, "running")) { + monitor_printf(mon, "running"); + if (qdict_get_bool(qdict, "single-step")) { + monitor_printf(mon, " (single step mode)"); } - } else - monitor_printf(mon, "VM status: paused\n"); + } else { + monitor_printf(mon, "paused"); + } + + monitor_printf(mon, "\n"); +} + +/** + * do_info_status(): VM status + * + * Return a QDict with the following information: + * + * - "running": true if the VM is running, or false if it is paused + * - "single-step": true if the VM is in single step mode, false otherwise + * + * Example: + * + * { "running": true, "single-step": false } + */ +static void do_info_status(Monitor *mon, QObject **ret_data) +{ + *ret_data = qobject_from_jsonf("{ 'running': %i, 'single-step': %i }", + vm_running, singlestep); } /** @@ -2370,7 +2395,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",