From patchwork Mon Dec 6 18:23:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74423 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 217F5B708B for ; Tue, 7 Dec 2010 05:27:58 +1100 (EST) Received: from localhost ([127.0.0.1]:52616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfn0-0004LG-KF for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:27:54 -0500 Received: from [140.186.70.92] (port=35850 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfjj-00032E-4f for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfjh-00049B-V2 for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:31 -0500 Received: from mx1.redhat.com ([209.132.183.28]:37536) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfjh-00048z-Mg for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:29 -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 oB6IOPnU014893 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:26 -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 oB6IOOhl030001; Mon, 6 Dec 2010 13:24:25 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:23:52 -0200 Message-Id: <1291659852-23028-6-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 05/25] Monitor: Convert do_info_version_print() into do_info_version() 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 The new handler directly calls qmp_query_version() to gather data and then prints it. This change allows us to drop the user_print callback. Signed-off-by: Luiz Capitulino --- monitor.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 6252b3f..56575a6 100644 --- a/monitor.c +++ b/monitor.c @@ -730,11 +730,12 @@ 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) +static void do_info_version(Monitor *mon) { - QDict *qdict; - QDict *qemu; + QDict *qdict, *qemu; + QObject *data; + qmp_query_version(NULL, &data); qdict = qobject_to_qdict(data); qemu = qdict_get_qdict(qdict, "qemu"); @@ -743,6 +744,8 @@ static void do_info_version_print(Monitor *mon, const QObject *data) qdict_get_int(qemu, "minor"), qdict_get_int(qemu, "micro"), qdict_get_str(qdict, "package")); + + qobject_decref(data); } static void do_info_name_print(Monitor *mon, const QObject *data) @@ -2385,8 +2388,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the version of QEMU", - .user_print = do_info_version_print, - .mhandler.info_new = qmp_query_version, + .mhandler.info = do_info_version, }, { .name = "network",