From patchwork Mon Dec 6 18:23:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74441 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 CBD73B70EC for ; Tue, 7 Dec 2010 05:39:02 +1100 (EST) Received: from localhost ([127.0.0.1]:51918 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfxj-0001Y0-BT for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:38:59 -0500 Received: from [140.186.70.92] (port=35818 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfje-0002xZ-2J for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfjd-00048Q-0V for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:25 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35214) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfjc-00048F-OW for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:24 -0500 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.13.8/8.13.8) with ESMTP id oB6IOO0Z017470 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:24 -0500 Received: from localhost ([10.3.113.17]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOMSF007002; Mon, 6 Dec 2010 13:24:23 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:23:51 -0200 Message-Id: <1291659852-23028-5-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.11 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 04/25] Monitor: Move qmp_query_version() 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_version_print() to call it. Signed-off-by: Luiz Capitulino --- monitor.c | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/monitor.c b/monitor.c index 481eab2..6252b3f 100644 --- a/monitor.c +++ b/monitor.c @@ -714,21 +714,6 @@ help: help_cmd(mon, "info"); } -static void do_info_version_print(Monitor *mon, const QObject *data) -{ - QDict *qdict; - QDict *qemu; - - qdict = qobject_to_qdict(data); - qemu = qdict_get_qdict(qdict, "qemu"); - - monitor_printf(mon, "%" PRId64 ".%" PRId64 ".%" PRId64 "%s\n", - qdict_get_int(qemu, "major"), - qdict_get_int(qemu, "minor"), - qdict_get_int(qemu, "micro"), - qdict_get_str(qdict, "package")); -} - static void qmp_query_version(Monitor *mon, QObject **ret_data) { const char *version = QEMU_VERSION; @@ -745,6 +730,21 @@ static void qmp_query_version(Monitor *mon, QObject **ret_data) 'micro': %d }, 'package': %s }", major, minor, micro, QEMU_PKGVERSION); } +static void do_info_version_print(Monitor *mon, const QObject *data) +{ + QDict *qdict; + QDict *qemu; + + qdict = qobject_to_qdict(data); + qemu = qdict_get_qdict(qdict, "qemu"); + + monitor_printf(mon, "%" PRId64 ".%" PRId64 ".%" PRId64 "%s\n", + qdict_get_int(qemu, "major"), + qdict_get_int(qemu, "minor"), + qdict_get_int(qemu, "micro"), + qdict_get_str(qdict, "package")); +} + static void do_info_name_print(Monitor *mon, const QObject *data) { QDict *qdict;