From patchwork Fri Oct 16 15:23:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 36244 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 A90E6B7BC7 for ; Sat, 17 Oct 2009 02:53:36 +1100 (EST) Received: from localhost ([127.0.0.1]:35345 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Myp7V-0002LY-QR for incoming@patchwork.ozlabs.org; Fri, 16 Oct 2009 11:53:33 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MyofH-0007hT-KJ for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MyofC-0007ZO-67 for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:22 -0400 Received: from [199.232.76.173] (port=55658 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MyofB-0007Yd-Qm for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:56189) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MyofB-0007Zj-Dh for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:17 -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 n9GFOG8F018572 for ; Fri, 16 Oct 2009 11:24:16 -0400 Received: from localhost (vpn-13-155.rdu.redhat.com [10.11.13.155]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9GFOFnb023628 for ; Fri, 16 Oct 2009 11:24:15 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 16 Oct 2009 12:23:51 -0300 Message-Id: <1255706631-3742-10-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1255706631-3742-1-git-send-email-lcapitulino@redhat.com> References: <1255706631-3742-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 9/9] monitor: Convert do_closefd() to QObject 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 Note that errors are not being converted yet. Signed-off-by: Luiz Capitulino --- monitor.c | 2 +- qemu-monitor.hx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/monitor.c b/monitor.c index f35b55f..3d82ab8 100644 --- a/monitor.c +++ b/monitor.c @@ -1889,7 +1889,7 @@ static void do_getfd(Monitor *mon, const QDict *qdict, QObject **ret_data) QLIST_INSERT_HEAD(&mon->fds, monfd, next); } -static void do_closefd(Monitor *mon, const QDict *qdict) +static void do_closefd(Monitor *mon, const QDict *qdict, QObject **ret_data) { const char *fdname = qdict_get_str(qdict, "fdname"); mon_fd_t *monfd; diff --git a/qemu-monitor.hx b/qemu-monitor.hx index cc4487e..bb01c14 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -1029,7 +1029,8 @@ ETEXI .args_type = "fdname:s", .params = "closefd name", .help = "close a file descriptor previously passed via SCM rights", - .mhandler.cmd = do_closefd, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_closefd, }, STEXI