From patchwork Thu Sep 16 20:20: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: 65001 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 2EB77B70F2 for ; Fri, 17 Sep 2010 06:54:52 +1000 (EST) Received: from localhost ([127.0.0.1]:48877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwLTj-000086-LL for incoming@patchwork.ozlabs.org; Thu, 16 Sep 2010 16:54:47 -0400 Received: from [140.186.70.92] (port=39529 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OwKxQ-0000UY-I5 for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OwKxP-0001Ox-8u for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7542) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OwKxP-0001Om-1X for qemu-devel@nongnu.org; Thu, 16 Sep 2010 16:21:23 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8GKLMvO022772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 16 Sep 2010 16:21:22 -0400 Received: from localhost ([10.3.113.6]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8GKLKAc018329; Thu, 16 Sep 2010 16:21:21 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 16 Sep 2010 17:20:52 -0300 Message-Id: <1284668464-15981-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> References: <1284668464-15981-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 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/18] Monitor: Convert do_info() back to HMP 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 This is a HMP specific handler, it makes no sense to have it under QMP. Signed-off-by: Luiz Capitulino --- monitor.c | 5 ++--- qemu-monitor.hx | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/monitor.c b/monitor.c index 1d52362..ea66ac3 100644 --- a/monitor.c +++ b/monitor.c @@ -633,7 +633,7 @@ static void user_async_info_handler(Monitor *mon, const mon_cmd_t *cmd) } } -static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) +static void do_info(Monitor *mon, const QDict *qdict) { const mon_cmd_t *cmd; const char *item = qdict_get_try_str(qdict, "item"); @@ -665,11 +665,10 @@ static int do_info(Monitor *mon, const QDict *qdict, QObject **ret_data) cmd->mhandler.info(mon); } - return 0; + return; help: help_cmd(mon, "info"); - return 0; } static void do_info_version_print(Monitor *mon, const QObject *data) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 49bcd8d..57d28ac 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1654,8 +1654,7 @@ EQMP .args_type = "item:s?", .params = "[subcommand]", .help = "show various information about the system state", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_info, + .mhandler.cmd = do_info, }, STEXI