From patchwork Fri Oct 16 15:23:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 36243 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 D35EDB7BBF for ; Sat, 17 Oct 2009 02:52:01 +1100 (EST) Received: from localhost ([127.0.0.1]:49495 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Myp5z-0001Ob-51 for incoming@patchwork.ozlabs.org; Fri, 16 Oct 2009 11:51:59 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MyofG-0007fm-5h for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Myof8-0007S8-JG for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:18 -0400 Received: from [199.232.76.173] (port=55653 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Myof7-0007Ro-Cb for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63711) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Myof7-0007Yd-1U for qemu-devel@nongnu.org; Fri, 16 Oct 2009 11:24:13 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9GFOCRd006775 for ; Fri, 16 Oct 2009 11:24:12 -0400 Received: from localhost (vpn-13-155.rdu.redhat.com [10.11.13.155]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9GFOBs6006705 for ; Fri, 16 Oct 2009 11:24:12 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 16 Oct 2009 12:23:49 -0300 Message-Id: <1255706631-3742-8-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.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 7/9] monitor: Convert do_eject() 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 a095971..a0d371d 100644 --- a/monitor.c +++ b/monitor.c @@ -570,7 +570,7 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force) return 0; } -static void do_eject(Monitor *mon, const QDict *qdict) +static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) { BlockDriverState *bs; int force = qdict_get_int(qdict, "force"); diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 4610ad4..05b4534 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -133,7 +133,8 @@ ETEXI .args_type = "force:-f,filename:B", .params = "[-f] device", .help = "eject a removable medium (use -f to force it)", - .mhandler.cmd = do_eject, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_eject, }, STEXI