From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NfOCL-0006n4-Pa for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:29 -0500 Received: from [199.232.76.173] (port=57711 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NfOCK-0006li-5X for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:28 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NfOCI-0001FV-Hh for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17471) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NfOCH-0001F8-5b for qemu-devel@nongnu.org; Wed, 10 Feb 2010 20:50:26 -0500 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1B1oNqu016102 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 10 Feb 2010 20:50:23 -0500 From: Luiz Capitulino Date: Wed, 10 Feb 2010 23:49:50 -0200 Message-Id: <1265853007-27300-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> References: <1265853007-27300-1-git-send-email-lcapitulino@redhat.com> Subject: [Qemu-devel] [PATCH 04/21] Monitor: Convert do_eject() to cmd_new_ret() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com Signed-off-by: Luiz Capitulino --- monitor.c | 6 +++--- qemu-monitor.hx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index cede368..e960c38 100644 --- a/monitor.c +++ b/monitor.c @@ -989,7 +989,7 @@ static int eject_device(Monitor *mon, BlockDriverState *bs, int force) return 0; } -static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) +static int do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) { BlockDriverState *bs; int force = qdict_get_int(qdict, "force"); @@ -998,9 +998,9 @@ static void do_eject(Monitor *mon, const QDict *qdict, QObject **ret_data) bs = bdrv_find(filename); if (!bs) { qemu_error_new(QERR_DEVICE_NOT_FOUND, filename); - return; + return -1; } - eject_device(mon, bs, force); + return eject_device(mon, bs, force); } static void do_block_set_passwd(Monitor *mon, const QDict *qdict, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 0eab6db..c1bd773 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -138,7 +138,7 @@ ETEXI .params = "[-f] device", .help = "eject a removable medium (use -f to force it)", .user_print = monitor_user_noop, - .mhandler.cmd_new = do_eject, + .cmd_new_ret = do_eject, }, STEXI -- 1.6.6