From patchwork Thu Sep 30 20:56:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 66272 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 1D053B6F11 for ; Fri, 1 Oct 2010 07:26:24 +1000 (EST) Received: from localhost ([127.0.0.1]:58235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1Qdw-0007i5-LG for incoming@patchwork.ozlabs.org; Thu, 30 Sep 2010 17:26:20 -0400 Received: from [140.186.70.92] (port=50890 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P1QC3-0001v6-Mp for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P1QC2-0003dl-TQ for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12260) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P1QC2-0003dd-KK for qemu-devel@nongnu.org; Thu, 30 Sep 2010 16:57:30 -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 o8UKvT9Y005251 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 30 Sep 2010 16:57:29 -0400 Received: from localhost (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o8UKvS7N016488; Thu, 30 Sep 2010 16:57:29 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Thu, 30 Sep 2010 17:56:18 -0300 Message-Id: <1285880180-29724-18-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1285880180-29724-1-git-send-email-lcapitulino@redhat.com> References: <1285880180-29724-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 17/19] Monitor: Directly call QObject handlers 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 avoids handle_user_command() calling monitor_call_handler(), which is currently shared with QMP. Signed-off-by: Luiz Capitulino --- monitor.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/monitor.c b/monitor.c index a48f919..adc5bbd 100644 --- a/monitor.c +++ b/monitor.c @@ -3914,7 +3914,15 @@ static void handle_user_command(Monitor *mon, const char *cmdline) if (handler_is_async(cmd)) { user_async_cmd_handler(mon, cmd, qdict); } else if (handler_is_qobject(cmd)) { - monitor_call_handler(mon, cmd, qdict); + QObject *data = NULL; + + /* XXX: ignores the error code */ + cmd->mhandler.cmd_new(mon, qdict, &data); + assert(!monitor_has_error(mon)); + if (data) { + cmd->user_print(mon, data); + qobject_decref(data); + } } else { cmd->mhandler.cmd(mon, qdict); }