From patchwork Mon Dec 6 18:24:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74450 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 A87D4B708B for ; Tue, 7 Dec 2010 05:47:05 +1100 (EST) Received: from localhost ([127.0.0.1]:43856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPg5W-0005nM-Pq for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:47:03 -0500 Received: from [140.186.70.92] (port=36026 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfjz-0003FO-IX for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfjy-0004Cz-AI for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:47 -0500 Received: from mx1.redhat.com ([209.132.183.28]:3597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfjy-0004Ce-1x for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:46 -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 oB6IOj8N014937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:45 -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 oB6IOil5004309; Mon, 6 Dec 2010 13:24:44 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:24:03 -0200 Message-Id: <1291659852-23028-17-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 16/25] Monitor: Convert do_info_mice_print() into do_info_mice() 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_mice() to gather data and then prints it. This change allows us to drop the user_print callback. Signed-off-by: Luiz Capitulino --- console.h | 2 +- input.c | 9 +++++++-- monitor.c | 3 +-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/console.h b/console.h index f613e4e..232714b 100644 --- a/console.h +++ b/console.h @@ -72,7 +72,7 @@ struct MouseTransformInfo { int a[7]; }; -void do_info_mice_print(Monitor *mon, const QObject *data); +void do_info_mice(Monitor *mon); void qmp_query_mice(Monitor *mon, QObject **ret_data); void do_mouse_set(Monitor *mon, const QDict *qdict); diff --git a/input.c b/input.c index a3ea9c2..cbe0074 100644 --- a/input.c +++ b/input.c @@ -207,17 +207,22 @@ static void info_mice_iter(QObject *data, void *opaque) qdict_get_bool(mouse, "absolute") ? " (absolute)" : ""); } -void do_info_mice_print(Monitor *mon, const QObject *data) +void do_info_mice(Monitor *mon) { QList *mice_list; + QObject *data; + qmp_query_mice(NULL, &data); mice_list = qobject_to_qlist(data); if (qlist_empty(mice_list)) { monitor_printf(mon, "No mouse devices connected\n"); - return; + goto out; } qlist_iter(mice_list, info_mice_iter, mon); + +out: + qobject_decref(data); } void qmp_query_mice(Monitor *mon, QObject **ret_data) diff --git a/monitor.c b/monitor.c index 445c73a..3b86076 100644 --- a/monitor.c +++ b/monitor.c @@ -2560,8 +2560,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show which guest mouse is receiving events", - .user_print = do_info_mice_print, - .mhandler.info_new = qmp_query_mice, + .mhandler.info = do_info_mice, }, { .name = "vnc",