From patchwork Mon Dec 6 18:23:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74437 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 0FA6DB70AF for ; Tue, 7 Dec 2010 05:36:04 +1100 (EST) Received: from localhost ([127.0.0.1]:51856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfuq-0008WG-TF for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:36:01 -0500 Received: from [140.186.70.92] (port=35834 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfjh-00030i-Fp for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfjg-00048r-FZ for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:42884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfjg-00048n-6m for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:28 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IORQ8017484 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:27 -0500 Received: from localhost ([10.3.113.17]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oB6IOQeH004777; Mon, 6 Dec 2010 13:24:27 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:23:53 -0200 Message-Id: <1291659852-23028-7-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.25 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 06/25] Monitor: Convert qemu_chr_info_print() into qemu_chr_info() 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_chardev() to gather data and then prints it. This change allows us to drop the user_print callback. Signed-off-by: Luiz Capitulino --- monitor.c | 3 +-- qemu-char.c | 8 ++++++-- qemu-char.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 56575a6..d48c137 100644 --- a/monitor.c +++ b/monitor.c @@ -2402,8 +2402,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the character devices", - .user_print = qemu_chr_info_print, - .mhandler.info_new = qmp_query_chardev, + .mhandler.info = qemu_chr_info, }, { .name = "block", diff --git a/qemu-char.c b/qemu-char.c index e8788e6..063943f 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2584,9 +2584,13 @@ static void qemu_chr_qlist_iter(QObject *obj, void *opaque) qdict_get_str(chr_dict, "filename")); } -void qemu_chr_info_print(Monitor *mon, const QObject *ret_data) +void qemu_chr_info(Monitor *mon) { - qlist_iter(qobject_to_qlist(ret_data), qemu_chr_qlist_iter, mon); + QObject *data; + + qmp_query_chardev(NULL, &data); + qlist_iter(qobject_to_qlist(data), qemu_chr_qlist_iter, mon); + qobject_decref(data); } void qmp_query_chardev(Monitor *mon, QObject **ret_data) diff --git a/qemu-char.h b/qemu-char.h index a456bb9..09d3de3 100644 --- a/qemu-char.h +++ b/qemu-char.h @@ -92,7 +92,7 @@ int qemu_chr_can_read(CharDriverState *s); void qemu_chr_read(CharDriverState *s, uint8_t *buf, int len); int qemu_chr_get_msgfd(CharDriverState *s); void qemu_chr_accept_input(CharDriverState *s); -void qemu_chr_info_print(Monitor *mon, const QObject *ret_data); +void qemu_chr_info(Monitor *mon); void qmp_query_chardev(Monitor *mon, QObject **ret_data); CharDriverState *qemu_chr_find(const char *name);