From patchwork Mon Dec 6 18:24:01 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74439 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 1DC54B70EC for ; Tue, 7 Dec 2010 05:36:29 +1100 (EST) Received: from localhost ([127.0.0.1]:51946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfvG-000088-5H for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:36:26 -0500 Received: from [140.186.70.92] (port=35967 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfjw-0003D6-CY for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfjv-0004Bp-DH for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41708) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfjv-0004Bk-34 for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:43 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOfZW012652 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:42 -0500 Received: from localhost ([10.3.113.17]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oB6IOeiF004295; Mon, 6 Dec 2010 13:24:41 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:24:01 -0200 Message-Id: <1291659852-23028-15-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com> References: <1291659852-23028-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: aliguori@us.ibm.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 14/25] Monitor: Move qmp_query_status() up in monitor.c 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 So that next commit can change do_info_status_print() to use it. Signed-off-by: Luiz Capitulino --- monitor.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/monitor.c b/monitor.c index 4286375..731cb35 100644 --- a/monitor.c +++ b/monitor.c @@ -2137,6 +2137,12 @@ static void do_inject_nmi(Monitor *mon, const QDict *qdict) } #endif +static void qmp_query_status(Monitor *mon, QObject **ret_data) +{ + *ret_data = qobject_from_jsonf("{ 'running': %i, 'singlestep': %i }", + vm_running, singlestep); +} + static void do_info_status_print(Monitor *mon, const QObject *data) { QDict *qdict; @@ -2156,12 +2162,6 @@ static void do_info_status_print(Monitor *mon, const QObject *data) monitor_printf(mon, "\n"); } -static void qmp_query_status(Monitor *mon, QObject **ret_data) -{ - *ret_data = qobject_from_jsonf("{ 'running': %i, 'singlestep': %i }", - vm_running, singlestep); -} - static qemu_acl *find_acl(Monitor *mon, const char *name) { qemu_acl *acl = qemu_acl_find(name);