From patchwork Mon Dec 6 18:24:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 74443 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 61AFCB70EE for ; Tue, 7 Dec 2010 05:40:27 +1100 (EST) Received: from localhost ([127.0.0.1]:52465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfz6-0001vy-Om for incoming@patchwork.ozlabs.org; Mon, 06 Dec 2010 13:40:24 -0500 Received: from [140.186.70.92] (port=35997 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PPfjx-0003EI-Rt for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PPfjw-0004CG-Io for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22718) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PPfjw-0004C0-Bo for qemu-devel@nongnu.org; Mon, 06 Dec 2010 13:24:44 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oB6IOhsd021248 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 6 Dec 2010 13:24:43 -0500 Received: from localhost ([10.3.113.17]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oB6IOgcQ002882; Mon, 6 Dec 2010 13:24:43 -0500 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Mon, 6 Dec 2010 16:24:02 -0200 Message-Id: <1291659852-23028-16-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.24 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 15/25] Monitor: Convert do_info_status_print() into do_info_status() 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_status() to gather data and then prints it. This change allows us to drop the user_print callback. Signed-off-by: Luiz Capitulino --- monitor.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/monitor.c b/monitor.c index 731cb35..445c73a 100644 --- a/monitor.c +++ b/monitor.c @@ -2143,10 +2143,12 @@ static void qmp_query_status(Monitor *mon, QObject **ret_data) vm_running, singlestep); } -static void do_info_status_print(Monitor *mon, const QObject *data) +static void do_info_status(Monitor *mon) { QDict *qdict; + QObject *data; + qmp_query_status(NULL, &data); qdict = qobject_to_qdict(data); monitor_printf(mon, "VM status: "); @@ -2160,6 +2162,7 @@ static void do_info_status_print(Monitor *mon, const QObject *data) } monitor_printf(mon, "\n"); + qobject_decref(data); } static qemu_acl *find_acl(Monitor *mon, const char *name) @@ -2543,8 +2546,7 @@ static const mon_cmd_t info_cmds[] = { .args_type = "", .params = "", .help = "show the current VM status (running|paused)", - .user_print = do_info_status_print, - .mhandler.info_new = qmp_query_status, + .mhandler.info = do_info_status, }, { .name = "pcmcia",