From patchwork Fri Sep 9 20:25:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 114132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 17F56B71A0 for ; Sat, 10 Sep 2011 06:26:53 +1000 (EST) Received: from localhost ([::1]:42206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R27f0-0004dE-02 for incoming@patchwork.ozlabs.org; Fri, 09 Sep 2011 16:26:50 -0400 Received: from eggs.gnu.org ([140.186.70.92]:41787) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R27eN-00036H-3j for qemu-devel@nongnu.org; Fri, 09 Sep 2011 16:26:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R27eM-0001uM-07 for qemu-devel@nongnu.org; Fri, 09 Sep 2011 16:26:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40849) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R27eL-0001u8-P9 for qemu-devel@nongnu.org; Fri, 09 Sep 2011 16:26:09 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p89KQ7eu004298 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 9 Sep 2011 16:26:07 -0400 Received: from localhost (ovpn-113-92.phx2.redhat.com [10.3.113.92]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p89KQ6pd031375; Fri, 9 Sep 2011 16:26:06 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 9 Sep 2011 17:25:46 -0300 Message-Id: <1315599946-27081-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1315599946-27081-1-git-send-email-lcapitulino@redhat.com> References: <1315599946-27081-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, aliguori@us.ibm.com, jan.kiszka@siemens.com, armbru@redhat.com, amit.shah@redhat.com, vilanova@ac.upc.edu Subject: [Qemu-devel] [PATCH 9/9] HMP: info status: Print the VM state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Today our printf format for the "info status" command is: VM status: %s Where the string can be "running", "running (single step mode)" or "paused". This commit extends it to: VM status: %s (%s) The second string corresponds to the "status" field as returned by the query-status QMP command and it's only printed if "status" is not "running" or "paused". Example: VM status: paused (shutdown) PS: libvirt uses "info status" when using HMP, but the new format should not break it. Signed-off-by: Luiz Capitulino --- monitor.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/monitor.c b/monitor.c index 7684ba9..860530b 100644 --- a/monitor.c +++ b/monitor.c @@ -2618,6 +2618,7 @@ static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data) static void do_info_status_print(Monitor *mon, const QObject *data) { QDict *qdict; + const char *status; qdict = qobject_to_qdict(data); @@ -2631,6 +2632,11 @@ static void do_info_status_print(Monitor *mon, const QObject *data) monitor_printf(mon, "paused"); } + status = qdict_get_str(qdict, "status"); + if (strcmp(status, "paused") && strcmp(status, "running")) { + monitor_printf(mon, " (%s)", status); + } + monitor_printf(mon, "\n"); }