From patchwork Mon Dec 6 18:23:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74457 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 548EAB70DA for ; Tue, 7 Dec 2010 06:05:39 +1100 (EST) Received: from localhost ([127.0.0.1]:45880 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPgNU-00083o-Ip for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 14:05:36 -0500 Received: from [140.186.70.92] (port=39173 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPg4j-00067G-2u for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:46:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPg4i-0002uw-4H for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:46:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:63815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPg4h-0002up-RP for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:46:12 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOcC3014919 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:38 -0500 Received: from localhost ([10.3.113.17]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOblm030047; Mon, 6 Dec 2010 13:24:37 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:23:59 -0200 Message-Id: <1291659852-23028-13-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.67 on 10.5.11.12 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 12/25] Monitor: Move qmp_query_kvm() 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_kvm_print() to call it. Signed-off-by: Luiz Capitulino --- monitor.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/monitor.c b/monitor.c index 1fbe78b..e8f0562 100644 --- a/monitor.c +++ b/monitor.c @@ -1994,6 +1994,16 @@ static void tlb_info(Monitor *mon) #endif +static void qmp_query_kvm(Monitor *mon, QObject **ret_data) +{ +#ifdef CONFIG_KVM + *ret_data = qobject_from_jsonf("{ 'enabled': %i, 'present': true }", + kvm_enabled()); +#else + *ret_data = qobject_from_jsonf("{ 'enabled': false, 'present': false }"); +#endif +} + static void do_info_kvm_print(Monitor *mon, const QObject *data) { QDict *qdict; @@ -2009,16 +2019,6 @@ static void do_info_kvm_print(Monitor *mon, const QObject *data) } } -static void qmp_query_kvm(Monitor *mon, QObject **ret_data) -{ -#ifdef CONFIG_KVM - *ret_data = qobject_from_jsonf("{ 'enabled': %i, 'present': true }", - kvm_enabled()); -#else - *ret_data = qobject_from_jsonf("{ 'enabled': false, 'present': false }"); -#endif -} - static void do_info_numa(Monitor *mon) { int i;